From 9401f41558ff22997038e5f5dce43e73527433ff Mon Sep 17 00:00:00 2001 From: Vinzent Steinberg Date: Mon, 8 Jul 2019 16:04:59 +0200 Subject: [PATCH] Use Rust 2018 idioms --- benches/kurtosis.rs | 6 +++--- benches/mean.rs | 8 ++++---- benches/min.rs | 8 ++++---- src/histogram.rs | 4 ++-- src/lib.rs | 6 +++--- tests/histogram.rs | 8 ++++---- tests/kurtosis.rs | 2 +- tests/macros.rs | 2 +- tests/max.rs | 4 ++-- tests/mean.rs | 2 +- tests/min.rs | 4 ++-- tests/moments.rs | 2 +- tests/proptest.rs | 2 +- tests/quantile.rs | 4 ++-- tests/random.rs | 4 ++-- tests/skewness.rs | 2 +- tests/streaming_stats.rs | 8 ++++---- tests/weighted_mean.rs | 2 +- 18 files changed, 39 insertions(+), 39 deletions(-) diff --git a/benches/kurtosis.rs b/benches/kurtosis.rs index d82bef4..3796729 100644 --- a/benches/kurtosis.rs +++ b/benches/kurtosis.rs @@ -1,10 +1,10 @@ #![cfg_attr(feature = "cargo-clippy", allow(float_cmp, map_clone))] #[macro_use] extern crate bencher; -extern crate rand; -extern crate rand_xoshiro; -extern crate average; +use rand_xoshiro; + +use average; use bencher::Bencher; diff --git a/benches/mean.rs b/benches/mean.rs index 25dc469..dc21c32 100644 --- a/benches/mean.rs +++ b/benches/mean.rs @@ -1,11 +1,11 @@ #![cfg_attr(feature = "cargo-clippy", allow(float_cmp, map_clone))] #[macro_use] extern crate bencher; -extern crate rand; -extern crate rand_xoshiro; -extern crate average; -extern crate stats; +use rand_xoshiro; + +use average; +use stats; use bencher::Bencher; diff --git a/benches/min.rs b/benches/min.rs index eb90e22..76b7b3a 100644 --- a/benches/min.rs +++ b/benches/min.rs @@ -1,11 +1,11 @@ #![cfg_attr(feature = "cargo-clippy", allow(float_cmp, map_clone))] #[macro_use] extern crate bencher; -extern crate rand; -extern crate rand_xoshiro; -extern crate average; -extern crate stats; +use rand_xoshiro; + +use average; + use bencher::Bencher; diff --git a/src/histogram.rs b/src/histogram.rs index 1d14e50..b6aa1a1 100644 --- a/src/histogram.rs +++ b/src/histogram.rs @@ -50,7 +50,7 @@ macro_rules! define_histogram { } impl ::core::fmt::Debug for Histogram { - fn fmt(&self, formatter: &mut ::core::fmt::Formatter) + fn fmt(&self, formatter: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result { formatter.write_str("Histogram {{ range: ")?; self.range[..].fmt(formatter)?; @@ -154,7 +154,7 @@ macro_rules! define_histogram { /// Return an iterator over the bins and corresponding ranges: /// `((lower, upper), count)` #[inline] - pub fn iter(&self) -> IterHistogram { + pub fn iter(&self) -> IterHistogram<'_> { self.into_iter() } diff --git a/src/lib.rs b/src/lib.rs index e495e9c..beae3a5 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -90,15 +90,15 @@ #![no_std] -extern crate conv; -extern crate float_ord; + + #[cfg(feature = "serde1")] extern crate serde; #[cfg(feature = "serde1")] #[macro_use] extern crate serde_derive; #[cfg(feature = "serde1")] #[macro_use] extern crate serde_big_array; -extern crate num_traits; + #[macro_use] mod macros; #[macro_use] mod moments; diff --git a/tests/histogram.rs b/tests/histogram.rs index 11b6065..bc0952e 100644 --- a/tests/histogram.rs +++ b/tests/histogram.rs @@ -1,9 +1,9 @@ #[macro_use] extern crate average; -extern crate core; -extern crate rand; -extern crate rand_xoshiro; -extern crate rand_distr; + + +use rand_xoshiro; +use rand_distr; #[cfg(feature = "serde1")] #[macro_use] extern crate serde_derive; #[cfg(feature = "serde1")] diff --git a/tests/kurtosis.rs b/tests/kurtosis.rs index dfb2b12..08fb214 100644 --- a/tests/kurtosis.rs +++ b/tests/kurtosis.rs @@ -2,7 +2,7 @@ #[macro_use] extern crate average; -extern crate core; + #[cfg(feature = "serde1")] extern crate serde_json; diff --git a/tests/macros.rs b/tests/macros.rs index db3b6f6..3f0db6a 100644 --- a/tests/macros.rs +++ b/tests/macros.rs @@ -2,7 +2,7 @@ #[macro_use] extern crate average; -extern crate core; + use average::{Estimate, Min, Max}; diff --git a/tests/max.rs b/tests/max.rs index 46e6827..17c55c0 100644 --- a/tests/max.rs +++ b/tests/max.rs @@ -1,8 +1,8 @@ #![cfg_attr(feature = "cargo-clippy", allow(float_cmp, map_clone))] -extern crate average; -extern crate core; + + #[cfg(feature = "serde1")] extern crate serde_json; diff --git a/tests/mean.rs b/tests/mean.rs index b0f8c88..208c19d 100644 --- a/tests/mean.rs +++ b/tests/mean.rs @@ -2,7 +2,7 @@ #[macro_use] extern crate average; -extern crate core; + #[cfg(feature = "serde")] extern crate serde_json; diff --git a/tests/min.rs b/tests/min.rs index 5c0fadc..ef33172 100644 --- a/tests/min.rs +++ b/tests/min.rs @@ -1,8 +1,8 @@ #![cfg_attr(feature = "cargo-clippy", allow(float_cmp, map_clone))] -extern crate average; -extern crate core; + + #[cfg(feature = "serde1")] extern crate serde_json; diff --git a/tests/moments.rs b/tests/moments.rs index 9bb6728..83d97a4 100644 --- a/tests/moments.rs +++ b/tests/moments.rs @@ -2,7 +2,7 @@ #[macro_use] extern crate average; -extern crate core; + #[cfg(feature = "serde1")] extern crate serde_json; diff --git a/tests/proptest.rs b/tests/proptest.rs index 90bb294..f4b5fbe 100644 --- a/tests/proptest.rs +++ b/tests/proptest.rs @@ -3,7 +3,7 @@ #[macro_use] extern crate average; #[macro_use] extern crate proptest; -extern crate core; + use core::iter::Iterator; diff --git a/tests/quantile.rs b/tests/quantile.rs index d2d8936..9f0becb 100644 --- a/tests/quantile.rs +++ b/tests/quantile.rs @@ -1,9 +1,9 @@ #![cfg_attr(feature = "cargo-clippy", allow(float_cmp, map_clone))] -extern crate average; + #[cfg(feature = "serde1")] extern crate serde_json; -extern crate quantiles; + use average::{Estimate, Quantile}; use quantiles::ckms::CKMS; diff --git a/tests/random.rs b/tests/random.rs index 02d69a6..a082fe3 100644 --- a/tests/random.rs +++ b/tests/random.rs @@ -2,8 +2,8 @@ #[macro_use] extern crate average; -extern crate rand; -extern crate rand_distr; + +use rand_distr; use rand_distr::Distribution; diff --git a/tests/skewness.rs b/tests/skewness.rs index 4cd23a6..190dce8 100644 --- a/tests/skewness.rs +++ b/tests/skewness.rs @@ -2,7 +2,7 @@ #[macro_use] extern crate average; -extern crate core; + #[cfg(feature = "serde1")] extern crate serde_json; diff --git a/tests/streaming_stats.rs b/tests/streaming_stats.rs index 0d49e5d..c8679a8 100644 --- a/tests/streaming_stats.rs +++ b/tests/streaming_stats.rs @@ -2,10 +2,10 @@ #[macro_use] extern crate average; -extern crate rand; -extern crate rand_xoshiro; -extern crate rand_distr; -extern crate stats; + + + +use stats; /// Create a random vector by sampling from a normal distribution. fn initialize_vec(size: usize) -> Vec { diff --git a/tests/weighted_mean.rs b/tests/weighted_mean.rs index b39b148..6ba434a 100644 --- a/tests/weighted_mean.rs +++ b/tests/weighted_mean.rs @@ -2,7 +2,7 @@ #[macro_use] extern crate average; -extern crate core; + #[cfg(feature = "serde1")] extern crate serde_json;