Fix clippy warnings

SubconsciousCompute · May 13, 2021 · dc8741e · dc8741e
1 parent b77674d
commit dc8741e
Show file tree

Hide file tree

Showing 14 changed files with 8 additions and 30 deletions.
diff --git a/benches/kurtosis.rs b/benches/kurtosis.rs
@@ -1,5 +1,3 @@
-#![cfg_attr(feature = "cargo-clippy", allow(clippy::float_cmp, map_clone))]
-
 use bencher::{Bencher, benchmark_group, benchmark_main};
 
 /// Create a random vector by sampling from a normal distribution.
@@ -21,15 +19,15 @@ fn initialize_vec() -> Vec<f64> {
 fn bench_kurtosis(b: &mut Bencher) {
  let values = initialize_vec();
  b.iter(|| {
- let m: average::Kurtosis = values.iter().map(|x| *x).collect();
+ let m: average::Kurtosis = values.iter().copied().collect();
  m
  });
 }
 
 fn bench_moments(b: &mut Bencher) {
  let values = initialize_vec();
  b.iter(|| {
- let m: average::Moments4 = values.iter().map(|x| *x).collect();
+ let m: average::Moments4 = values.iter().copied().collect();
  m
  });
 }

diff --git a/benches/mean.rs b/benches/mean.rs
@@ -1,5 +1,3 @@
-#![cfg_attr(feature = "cargo-clippy", allow(clippy::float_cmp, map_clone))]
-
 use bencher::{Bencher, benchmark_group, benchmark_main};
 
 /// Create a random vector by sampling from a normal distribution.
@@ -21,15 +19,15 @@ fn initialize_vec() -> Vec<f64> {
 fn bench_average(b: &mut Bencher) {
  let values = initialize_vec();
  b.iter(|| {
- let m: average::MeanWithError = values.iter().map(|x| *x).collect();
+ let m: average::MeanWithError = values.iter().copied().collect();
  m
  });
 }
 
 fn bench_stats(b: &mut Bencher) {
  let values = initialize_vec();
  b.iter(|| {
- let m: stats::OnlineStats = values.iter().map(|x| *x).collect();
+ let m: stats::OnlineStats = values.iter().copied().collect();
  m
  });
 }

diff --git a/benches/min.rs b/benches/min.rs
@@ -1,5 +1,3 @@
-#![cfg_attr(feature = "cargo-clippy", allow(clippy::float_cmp, map_clone))]
-
 use bencher::{Bencher, benchmark_group, benchmark_main};
 
 /// Create a random vector of random floats in [0, 1].
@@ -21,7 +19,7 @@ fn initialize_vec() -> Vec<f64> {
 fn bench_average(b: &mut Bencher) {
  let values = initialize_vec();
  b.iter(|| {
- let a: average::Min = values.iter().map(|x| *x).collect();
+ let a: average::Min = values.iter().copied().collect();
  a
  });
 }

diff --git a/tests/integration/histogram.rs b/tests/integration/histogram.rs
@@ -114,7 +114,7 @@ fn from_ranges_invalid() {
  Histogram10::from_ranges(invalid_order.iter().cloned()).unwrap_err(),
  InvalidRangeError::NotSorted
  );
- let mut valid_empty_ranges = valid.clone();
+ let mut valid_empty_ranges = valid;
  valid_empty_ranges[1] = 0.;
  valid_empty_ranges[10] = 1.;
  assert!(Histogram10::from_ranges(valid_empty_ranges.iter().cloned()).is_ok());

diff --git a/tests/integration/kurtosis.rs b/tests/integration/kurtosis.rs
@@ -1,5 +1,3 @@
-#![cfg_attr(feature = "cargo-clippy", allow(clippy::float_cmp, map_clone))]
-
 use core::iter::Iterator;
 
 use average::{Kurtosis, Estimate, Merge, assert_almost_eq};

diff --git a/tests/integration/main.rs b/tests/integration/main.rs
@@ -1,6 +1,8 @@
 #![cfg_attr(feature = "nightly",
  feature(const_generics, const_evaluatable_checked))]
 
+#![allow(clippy::float_cmp)]
+
 mod histogram;
 #[cfg(feature = "nightly")]
 mod histogram_const;

diff --git a/tests/integration/max.rs b/tests/integration/max.rs
@@ -1,5 +1,3 @@
-#![cfg_attr(feature = "cargo-clippy", allow(clippy::float_cmp, map_clone))]
-
 use core::iter::Iterator;
 
 use average::{Max, Estimate, Merge};

diff --git a/tests/integration/mean.rs b/tests/integration/mean.rs
@@ -1,5 +1,3 @@
-#![cfg_attr(feature = "cargo-clippy", allow(clippy::float_cmp, map_clone))]
-
 use core::iter::Iterator;
 
 use average::{MeanWithError, Estimate, Merge};

diff --git a/tests/integration/min.rs b/tests/integration/min.rs
@@ -1,5 +1,3 @@
-#![cfg_attr(feature = "cargo-clippy", allow(clippy::float_cmp, map_clone))]
-
 use core::iter::Iterator;
 
 use average::{Min, Estimate, Merge};

diff --git a/tests/integration/moments.rs b/tests/integration/moments.rs
@@ -1,5 +1,3 @@
-#![cfg_attr(feature = "cargo-clippy", allow(clippy::float_cmp, map_clone))]
-
 use core::iter::Iterator;
 
 use average::{Moments4, Merge, assert_almost_eq};

diff --git a/tests/integration/quantile.rs b/tests/integration/quantile.rs
@@ -1,5 +1,3 @@
-#![cfg_attr(feature = "cargo-clippy", allow(clippy::float_cmp, map_clone))]
-
 use average::{Estimate, Quantile};
 
 #[test]

diff --git a/tests/integration/random.rs b/tests/integration/random.rs
@@ -1,5 +1,3 @@
-#![cfg_attr(feature = "cargo-clippy", allow(clippy::float_cmp, map_clone))]
-
 use rand_distr::Distribution;
 
 use average::{Kurtosis, Estimate, assert_almost_eq};

diff --git a/tests/integration/skewness.rs b/tests/integration/skewness.rs
@@ -1,5 +1,3 @@
-#![cfg_attr(feature = "cargo-clippy", allow(clippy::float_cmp, map_clone))]
-
 use core::iter::Iterator;
 
 use average::{Skewness, Estimate, Merge, assert_almost_eq};

diff --git a/tests/integration/weighted_mean.rs b/tests/integration/weighted_mean.rs
@@ -1,5 +1,3 @@
-#![cfg_attr(feature = "cargo-clippy", allow(clippy::float_cmp, map_clone))]
-
 use core::iter::Iterator;
 
 use average::{WeightedMeanWithError, Merge, assert_almost_eq};