From 518fa2c7e6e5be89eca8df753d90b60d28f85a0c Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Wed, 21 Jun 2017 16:18:05 +0900 Subject: [PATCH 1/2] Remove prelude --- src/lib.rs | 23 ++++++++++++++++++----- src/prelude.rs | 15 --------------- 2 files changed, 18 insertions(+), 20 deletions(-) delete mode 100644 src/prelude.rs diff --git a/src/lib.rs b/src/lib.rs index 981475dd..67a47ef4 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -49,12 +49,12 @@ pub mod error; pub mod layout; pub mod impl2; -pub mod qr; -pub mod svd; -pub mod opnorm; -pub mod solve; pub mod cholesky; pub mod eigh; +pub mod opnorm; +pub mod qr; +pub mod solve; +pub mod svd; pub mod triangular; pub mod generate; @@ -62,4 +62,17 @@ pub mod assert; pub mod norm; pub mod trace; -pub mod prelude; +pub use assert::*; +pub use generate::*; +pub use layout::*; +pub use types::*; + +pub use cholesky::*; +pub use eigh::*; +pub use norm::*; +pub use opnorm::*; +pub use qr::*; +pub use solve::*; +pub use svd::*; +pub use trace::*; +pub use triangular::*; diff --git a/src/prelude.rs b/src/prelude.rs deleted file mode 100644 index 9f1910d4..00000000 --- a/src/prelude.rs +++ /dev/null @@ -1,15 +0,0 @@ - -pub use assert::*; -pub use generate::*; -pub use types::*; -pub use layout::*; - -pub use cholesky::*; -pub use eigh::*; -pub use norm::*; -pub use opnorm::*; -pub use qr::*; -pub use solve::*; -pub use svd::*; -pub use trace::*; -pub use triangular::*; From 84875f7ea6379f18ea9d43098caa2678bc1502a5 Mon Sep 17 00:00:00 2001 From: Toshiki Teramura Date: Wed, 21 Jun 2017 16:20:32 +0900 Subject: [PATCH 2/2] Drop prelude from tests --- src/bin/main.rs => examples/eigh.rs | 4 ++-- tests/cholesky.rs | 2 +- tests/eigh.rs | 4 ++-- tests/header.rs | 2 +- tests/inv.rs | 4 ++-- tests/layout.rs | 2 +- tests/opnorm.rs | 4 ++-- tests/qr.rs | 4 ++-- tests/svd.rs | 4 ++-- tests/triangular.rs | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) rename src/bin/main.rs => examples/eigh.rs (86%) diff --git a/src/bin/main.rs b/examples/eigh.rs similarity index 86% rename from src/bin/main.rs rename to examples/eigh.rs index 1b63a595..e36c9256 100644 --- a/src/bin/main.rs +++ b/examples/eigh.rs @@ -2,8 +2,8 @@ extern crate ndarray; extern crate ndarray_linalg; -use ndarray::prelude::*; -use ndarray_linalg::prelude::*; +use ndarray::*; +use ndarray_linalg::*; fn main() { let a = arr2(&[[3.0, 1.0, 1.0], [1.0, 3.0, 1.0], [1.0, 1.0, 3.0]]); diff --git a/tests/cholesky.rs b/tests/cholesky.rs index 526d4959..077d4de7 100644 --- a/tests/cholesky.rs +++ b/tests/cholesky.rs @@ -4,7 +4,7 @@ extern crate ndarray; extern crate ndarray_linalg; use ndarray::*; -use ndarray_linalg::prelude::*; +use ndarray_linalg::*; #[test] fn cholesky() { diff --git a/tests/eigh.rs b/tests/eigh.rs index 292c1705..88e1a8f2 100644 --- a/tests/eigh.rs +++ b/tests/eigh.rs @@ -3,8 +3,8 @@ extern crate ndarray; #[macro_use] extern crate ndarray_linalg; -use ndarray::prelude::*; -use ndarray_linalg::prelude::*; +use ndarray::*; +use ndarray_linalg::*; #[test] fn eigen_vector_manual() { diff --git a/tests/header.rs b/tests/header.rs index 84dc395e..ba60580d 100644 --- a/tests/header.rs +++ b/tests/header.rs @@ -10,7 +10,7 @@ extern crate num_traits; #[allow(unused_imports)] use ndarray::*; #[allow(unused_imports)] -use ndarray_linalg::prelude::*; +use ndarray_linalg::*; #[allow(unused_imports)] use rand_extra::*; #[allow(unused_imports)] diff --git a/tests/inv.rs b/tests/inv.rs index 2f8bd978..8e705e24 100644 --- a/tests/inv.rs +++ b/tests/inv.rs @@ -4,8 +4,8 @@ macro_rules! impl_test{ ($modname:ident, $clone:ident) => { mod $modname { use super::random_square; - use ndarray::prelude::*; - use ndarray_linalg::prelude::*; + use ndarray::*; + use ndarray_linalg::*; #[test] fn inv_random() { let a = random_square(3); diff --git a/tests/layout.rs b/tests/layout.rs index f0ff8d91..7615d1e3 100644 --- a/tests/layout.rs +++ b/tests/layout.rs @@ -3,7 +3,7 @@ extern crate ndarray; extern crate ndarray_linalg; use ndarray::*; -use ndarray_linalg::prelude::*; +use ndarray_linalg::*; use ndarray_linalg::layout::Layout; #[test] diff --git a/tests/opnorm.rs b/tests/opnorm.rs index eda418a1..6c3ec34d 100644 --- a/tests/opnorm.rs +++ b/tests/opnorm.rs @@ -17,8 +17,8 @@ fn $funcname() { macro_rules! impl_test_opnorm { ($modname:ident, $array:ty, $range:path) => { mod $modname { - use ndarray::prelude::*; - use ndarray_linalg::prelude::*; + use ndarray::*; + use ndarray_linalg::*; use num_traits::Float; fn gen(i: usize, j: usize, rev: bool) -> $array { let n = (i * j + 1) as f64; diff --git a/tests/qr.rs b/tests/qr.rs index 3232782f..b3d46398 100644 --- a/tests/qr.rs +++ b/tests/qr.rs @@ -5,8 +5,8 @@ macro_rules! impl_test { #[test] fn $funcname() { use std::cmp::min; - use ndarray::prelude::*; - use ndarray_linalg::prelude::*; + use ndarray::*; + use ndarray_linalg::*; let a = $random($n, $m, $t); let ans = a.clone(); println!("a = \n{:?}", &a); diff --git a/tests/svd.rs b/tests/svd.rs index ccd16048..1aeeafcb 100644 --- a/tests/svd.rs +++ b/tests/svd.rs @@ -5,8 +5,8 @@ macro_rules! impl_test { #[test] fn $funcname() { use std::cmp::min; - use ndarray::prelude::*; - use ndarray_linalg::prelude::*; + use ndarray::*; + use ndarray_linalg::*; let a = $random($n, $m, $t); let answer = a.clone(); println!("a = \n{:?}", &a); diff --git a/tests/triangular.rs b/tests/triangular.rs index 9c9893c7..818dc54e 100644 --- a/tests/triangular.rs +++ b/tests/triangular.rs @@ -4,7 +4,7 @@ extern crate ndarray; extern crate ndarray_linalg; use ndarray::*; -use ndarray_linalg::prelude::*; +use ndarray_linalg::*; fn test1d(uplo: UPLO, a: ArrayBase, b: ArrayBase, tol: Tol) where A: Field + Absolute,