diff --git a/src/correlation.rs b/src/correlation.rs index 9ec9064f..ec3a1030 100644 --- a/src/correlation.rs +++ b/src/correlation.rs @@ -166,6 +166,8 @@ where #[cfg(test)] mod cov_tests { use super::*; + use ndarray::array; + use quickcheck::quickcheck; use rand; use rand::distributions::Uniform; use ndarray_rand::RandomExt; @@ -278,6 +280,8 @@ mod cov_tests { #[cfg(test)] mod pearson_correlation_tests { use super::*; + use ndarray::array; + use quickcheck::quickcheck; use rand::distributions::Uniform; use ndarray_rand::RandomExt; diff --git a/src/histogram/bins.rs b/src/histogram/bins.rs index 6c018359..e0c3a1ea 100644 --- a/src/histogram/bins.rs +++ b/src/histogram/bins.rs @@ -358,6 +358,7 @@ impl Bins { #[cfg(test)] mod edges_tests { use super::*; + use quickcheck::quickcheck; use std::collections::BTreeSet; use std::iter::FromIterator; diff --git a/src/histogram/strategies.rs b/src/histogram/strategies.rs index d2538c60..f669b35e 100644 --- a/src/histogram/strategies.rs +++ b/src/histogram/strategies.rs @@ -426,6 +426,7 @@ mod equispaced_tests { #[cfg(test)] mod sqrt_tests { use super::*; + use ndarray::array; #[should_panic] #[test] @@ -443,6 +444,7 @@ mod sqrt_tests { #[cfg(test)] mod rice_tests { use super::*; + use ndarray::array; #[should_panic] #[test] @@ -460,6 +462,7 @@ mod rice_tests { #[cfg(test)] mod sturges_tests { use super::*; + use ndarray::array; #[should_panic] #[test] @@ -477,6 +480,7 @@ mod sturges_tests { #[cfg(test)] mod fd_tests { use super::*; + use ndarray::array; #[should_panic] #[test] @@ -500,6 +504,7 @@ mod fd_tests { #[cfg(test)] mod auto_tests { use super::*; + use ndarray::array; #[should_panic] #[test] diff --git a/src/lib.rs b/src/lib.rs index fad9cef8..5d764a67 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -24,8 +24,6 @@ //! [`StatsBase.jl`]: https://juliastats.github.io/StatsBase.jl/latest/ -#[macro_use(azip, s)] -#[cfg_attr(test, macro_use(array))] extern crate ndarray; extern crate noisy_float; extern crate num_traits; @@ -35,10 +33,8 @@ extern crate itertools; #[cfg(test)] extern crate ndarray_rand; #[cfg(test)] -#[macro_use(quickcheck)] extern crate quickcheck; #[cfg(test)] -#[macro_use(abs_diff_eq)] extern crate approx; pub use maybe_nan::{MaybeNan, MaybeNanExt}; diff --git a/src/maybe_nan/mod.rs b/src/maybe_nan/mod.rs index a58712aa..3905fa9b 100644 --- a/src/maybe_nan/mod.rs +++ b/src/maybe_nan/mod.rs @@ -1,5 +1,5 @@ use ndarray::prelude::*; -use ndarray::{Data, DataMut, RemoveAxis}; +use ndarray::{s, Data, DataMut, RemoveAxis}; use noisy_float::types::{N32, N64}; /// A number type that can have not-a-number values. @@ -347,6 +347,7 @@ where #[cfg(test)] mod tests { use super::*; + use quickcheck::quickcheck; quickcheck! { fn remove_nan_mut_idempotent(is_nan: Vec) -> bool { diff --git a/src/quantile.rs b/src/quantile.rs index 6aa5f49b..9188aa2f 100644 --- a/src/quantile.rs +++ b/src/quantile.rs @@ -1,11 +1,12 @@ use interpolate::Interpolate; use ndarray::prelude::*; -use ndarray::{Data, DataMut, RemoveAxis}; +use ndarray::{s, Data, DataMut, RemoveAxis}; use std::cmp; use {MaybeNan, MaybeNanExt, Sort1dExt}; /// Interpolation strategies. pub mod interpolate { + use ndarray::azip; use ndarray::prelude::*; use num_traits::{FromPrimitive, ToPrimitive}; use std::ops::{Add, Div}; diff --git a/src/sort.rs b/src/sort.rs index ba24a000..eecda8f4 100644 --- a/src/sort.rs +++ b/src/sort.rs @@ -1,5 +1,5 @@ use ndarray::prelude::*; -use ndarray::{Data, DataMut}; +use ndarray::{s, Data, DataMut}; use rand::prelude::*; use rand::thread_rng; diff --git a/src/summary_statistics/means.rs b/src/summary_statistics/means.rs index dd0d5337..97217c23 100644 --- a/src/summary_statistics/means.rs +++ b/src/summary_statistics/means.rs @@ -42,8 +42,9 @@ where mod tests { use super::SummaryStatisticsExt; use std::f64; + use approx::abs_diff_eq; use noisy_float::types::N64; - use ndarray::Array1; + use ndarray::{array, Array1}; #[test] fn test_means_with_nan_values() {