Skip to content

Commit 844ea5a

Browse files
authored
Merge pull request #50 from termoshtt/remove_prelude
Remove prelude
2 parents 311bc1d + 84875f7 commit 844ea5a

File tree

12 files changed

+34
-36
lines changed

12 files changed

+34
-36
lines changed

src/bin/main.rs renamed to examples/eigh.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
extern crate ndarray;
33
extern crate ndarray_linalg;
44

5-
use ndarray::prelude::*;
6-
use ndarray_linalg::prelude::*;
5+
use ndarray::*;
6+
use ndarray_linalg::*;
77

88
fn main() {
99
let a = arr2(&[[3.0, 1.0, 1.0], [1.0, 3.0, 1.0], [1.0, 1.0, 3.0]]);

src/lib.rs

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,30 @@ pub mod error;
4949
pub mod layout;
5050
pub mod impl2;
5151

52-
pub mod qr;
53-
pub mod svd;
54-
pub mod opnorm;
55-
pub mod solve;
5652
pub mod cholesky;
5753
pub mod eigh;
54+
pub mod opnorm;
55+
pub mod qr;
56+
pub mod solve;
57+
pub mod svd;
5858
pub mod triangular;
5959

6060
pub mod generate;
6161
pub mod assert;
6262
pub mod norm;
6363
pub mod trace;
6464

65-
pub mod prelude;
65+
pub use assert::*;
66+
pub use generate::*;
67+
pub use layout::*;
68+
pub use types::*;
69+
70+
pub use cholesky::*;
71+
pub use eigh::*;
72+
pub use norm::*;
73+
pub use opnorm::*;
74+
pub use qr::*;
75+
pub use solve::*;
76+
pub use svd::*;
77+
pub use trace::*;
78+
pub use triangular::*;

src/prelude.rs

Lines changed: 0 additions & 15 deletions
This file was deleted.

tests/cholesky.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ extern crate ndarray;
44
extern crate ndarray_linalg;
55

66
use ndarray::*;
7-
use ndarray_linalg::prelude::*;
7+
use ndarray_linalg::*;
88

99
#[test]
1010
fn cholesky() {

tests/eigh.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ extern crate ndarray;
33
#[macro_use]
44
extern crate ndarray_linalg;
55

6-
use ndarray::prelude::*;
7-
use ndarray_linalg::prelude::*;
6+
use ndarray::*;
7+
use ndarray_linalg::*;
88

99
#[test]
1010
fn eigen_vector_manual() {

tests/header.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ extern crate num_traits;
1010
#[allow(unused_imports)]
1111
use ndarray::*;
1212
#[allow(unused_imports)]
13-
use ndarray_linalg::prelude::*;
13+
use ndarray_linalg::*;
1414
#[allow(unused_imports)]
1515
use rand_extra::*;
1616
#[allow(unused_imports)]

tests/inv.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ macro_rules! impl_test{
44
($modname:ident, $clone:ident) => {
55
mod $modname {
66
use super::random_square;
7-
use ndarray::prelude::*;
8-
use ndarray_linalg::prelude::*;
7+
use ndarray::*;
8+
use ndarray_linalg::*;
99
#[test]
1010
fn inv_random() {
1111
let a = random_square(3);

tests/layout.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ extern crate ndarray;
33
extern crate ndarray_linalg;
44

55
use ndarray::*;
6-
use ndarray_linalg::prelude::*;
6+
use ndarray_linalg::*;
77
use ndarray_linalg::layout::Layout;
88

99
#[test]

tests/opnorm.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ fn $funcname() {
1717
macro_rules! impl_test_opnorm {
1818
($modname:ident, $array:ty, $range:path) => {
1919
mod $modname {
20-
use ndarray::prelude::*;
21-
use ndarray_linalg::prelude::*;
20+
use ndarray::*;
21+
use ndarray_linalg::*;
2222
use num_traits::Float;
2323
fn gen(i: usize, j: usize, rev: bool) -> $array {
2424
let n = (i * j + 1) as f64;

tests/qr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ macro_rules! impl_test {
55
#[test]
66
fn $funcname() {
77
use std::cmp::min;
8-
use ndarray::prelude::*;
9-
use ndarray_linalg::prelude::*;
8+
use ndarray::*;
9+
use ndarray_linalg::*;
1010
let a = $random($n, $m, $t);
1111
let ans = a.clone();
1212
println!("a = \n{:?}", &a);

0 commit comments

Comments
 (0)