Replace macro_use of defmac with normal use

rust-ndarray · Oct 26, 2018 · 44c7fbe · 44c7fbe
1 parent 756258d
commit 44c7fbe
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/blas-tests/tests/oper.rs b/blas-tests/tests/oper.rs
@@ -1,4 +1,4 @@
-#[macro_use] extern crate defmac;
+extern crate defmac;
 extern crate ndarray;
 extern crate num_traits;
 
@@ -9,6 +9,7 @@ use ndarray::linalg::general_mat_vec_mul;
 use ndarray::{Ix, Ixs, SliceInfo, SliceOrIndex};
 
 use std::fmt;
+use defmac::defmac;
 use num_traits::Float;
 
 fn assert_approx_eq<F: fmt::Debug + Float>(f: F, g: F, tol: F) -> bool {

diff --git a/tests/array-construct.rs b/tests/array-construct.rs
@@ -1,7 +1,7 @@
-#[macro_use]
 extern crate defmac;
 extern crate ndarray;
 
+use defmac::defmac;
 use ndarray::prelude::*;
 
 #[test]

diff --git a/tests/array.rs b/tests/array.rs
@@ -1,7 +1,6 @@
 #![allow(non_snake_case)]
 
 extern crate ndarray;
-#[macro_use]
 extern crate defmac;
 extern crate itertools;
 
@@ -12,6 +11,7 @@ use ndarray::{
     arr3,
 };
 use ndarray::indices;
+use defmac::defmac;
 use itertools::{enumerate, zip};
 
 #[test]

diff --git a/tests/dimension.rs b/tests/dimension.rs
@@ -1,7 +1,8 @@
 extern crate ndarray;
-#[macro_use]
 extern crate defmac;
 
+use defmac::defmac;
+
 use ndarray::{
     RcArray,
     Array,

diff --git a/tests/oper.rs b/tests/oper.rs
@@ -1,4 +1,4 @@
-#[macro_use] extern crate defmac;
+extern crate defmac;
 extern crate ndarray;
 extern crate num_traits;
 
@@ -11,6 +11,7 @@ use ndarray::{Ix, Ixs, SliceInfo, SliceOrIndex};
 
 use std::fmt;
 use std::ops::Neg;
+use defmac::defmac;
 use num_traits::Float;
 
 fn test_oper(op: &str, a: &[f32], b: &[f32], c: &[f32])