From 69ba649ecc8a5523d04deba87891fb10b4d214d2 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Tue, 7 May 2024 16:09:39 -0700 Subject: [PATCH 1/4] Stop using deprecated trim methods --- src/lib.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 81bab8f..608fbe3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1390,7 +1390,6 @@ where } } -#[allow(deprecated)] // `trim_left_matches` and `trim_right_matches` since 1.33 fn from_str_generic(s: &str, from: F) -> Result, ParseComplexError> where F: Fn(&str) -> Result, @@ -1412,8 +1411,8 @@ where // ignore '+'/'-' if part of an exponent if (c == b'+' || c == b'-') && !(p == b'e' || p == b'E') { // trim whitespace around the separator - a = &s[..=i].trim_right_matches(char::is_whitespace); - b = &s[i + 2..].trim_left_matches(char::is_whitespace); + a = s[..=i].trim_end_matches(char::is_whitespace); + b = s[i + 2..].trim_start_matches(char::is_whitespace); neg_b = c == b'-'; if b.is_empty() || (neg_b && b.starts_with('-')) { From e367f3ab7ccf4e75feb43fdb5ac9649904eb7ae9 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Tue, 7 May 2024 16:12:13 -0700 Subject: [PATCH 2/4] Avoid `clippy::needless_borrow` in `Inv` --- src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 608fbe3..661b67b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1006,7 +1006,7 @@ impl> Inv for Complex { #[inline] fn inv(self) -> Self::Output { - (&self).inv() + Complex::inv(&self) } } @@ -1015,7 +1015,7 @@ impl<'a, T: Clone + Num + Neg> Inv for &'a Complex { #[inline] fn inv(self) -> Self::Output { - self.inv() + Complex::inv(self) } } From e99703254a14cca8617e7b5843efeac6e2d36223 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Tue, 7 May 2024 16:13:20 -0700 Subject: [PATCH 3/4] Fix `clippy::unit_arg` --- src/crand.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/crand.rs b/src/crand.rs index 5edf8a7..44ef441 100644 --- a/src/crand.rs +++ b/src/crand.rs @@ -70,7 +70,8 @@ fn test_rng() -> impl RngCore { } fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), rand::Error> { - Ok(self.fill_bytes(dest)) + self.fill_bytes(dest); + Ok(()) } } From 67398e38ce7eeb4570ba9427f9c2a67fbb30fa58 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Tue, 7 May 2024 16:14:51 -0700 Subject: [PATCH 4/4] Fix `clippy::needless_borrows_for_generic_args` --- src/crand.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/crand.rs b/src/crand.rs index 44ef441..12d55e0 100644 --- a/src/crand.rs +++ b/src/crand.rs @@ -95,7 +95,7 @@ fn generic_standard_f64() { let mut rng = test_rng(); let dist = ComplexDistribution::new(Standard, Standard); for _ in 0..100 { - let c: Complex = rng.sample(&dist); + let c: Complex = rng.sample(dist); assert!(c.re >= 0.0 && c.re < 1.0); assert!(c.im >= 0.0 && c.im < 1.0); } @@ -111,7 +111,7 @@ fn generic_uniform_f64() { let dist = ComplexDistribution::new(re, im); for _ in 0..100 { // no type annotation required, since `Uniform` only produces one type. - let c = rng.sample(&dist); + let c = rng.sample(dist); assert!(c.re >= -100.0 && c.re < 0.0); assert!(c.im >= 0.0 && c.im < 100.0); } @@ -126,7 +126,7 @@ fn generic_mixed_f64() { let dist = ComplexDistribution::new(re, Standard); for _ in 0..100 { // no type annotation required, since `Uniform` only produces one type. - let c = rng.sample(&dist); + let c = rng.sample(dist); assert!(c.re >= -100.0 && c.re < 0.0); assert!(c.im >= 0.0 && c.im < 1.0); } @@ -142,7 +142,7 @@ fn generic_uniform_i32() { let dist = ComplexDistribution::new(re, im); for _ in 0..100 { // no type annotation required, since `Uniform` only produces one type. - let c = rng.sample(&dist); + let c = rng.sample(dist); assert!(c.re >= -100 && c.re < 0); assert!(c.im >= 0 && c.im < 100); }