From 44c7fbe6001450adc9d31daffbee29085399a332 Mon Sep 17 00:00:00 2001
From: Jim Turner <github@turner.link>
Date: Thu, 25 Oct 2018 23:01:19 -0400
Subject: [PATCH] Replace macro_use of defmac with normal use

---
 blas-tests/tests/oper.rs | 3 ++-
 tests/array-construct.rs | 2 +-
 tests/array.rs           | 2 +-
 tests/dimension.rs       | 3 ++-
 tests/oper.rs            | 3 ++-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/blas-tests/tests/oper.rs b/blas-tests/tests/oper.rs
index 31c054388..80526e4d8 100644
--- 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
index 463eae980..1355b1258 100644
--- 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
index 81dcb1913..1c7183dd5 100644
--- 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
index 5e2be12b3..d59d74629 100644
--- 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
index feab584d9..3ce99fcb2 100644
--- 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])