Change tests to use s![] macro

Author: jturner314

src/dimension/mod.rs

@@ -505,7 +505,7 @@ mod test {
     use error::{from_kind, ErrorKind};
     use num_integer::gcd;
     use quickcheck::TestResult;
-    use slice::{Slice, SliceOrIndex};
+    use slice::Slice;
 
     #[test]
     fn slice_indexing_uncommon_strides() {
@@ -663,49 +663,17 @@ mod test {
 
     #[test]
     fn slices_intersect_true() {
-        assert!(slices_intersect(
-            &Dim([4, 5]),
-            &[(..).into(), (..).into()],
-            &[(..).into(), (..).into()],
-        ));
-        assert!(slices_intersect(
-            &Dim([4, 5]),
-            &[0.into(), (..).into()],
-            &[0.into(), (..).into()],
-        ));
-        assert!(slices_intersect(
-            &Dim([4, 5]),
-            &[SliceOrIndex::from(..).step_by(2), (..).into()],
-            &[SliceOrIndex::from(..).step_by(3), (..).into()],
-        ));
-        assert!(slices_intersect(
-            &Dim([4, 5]),
-            &[(..).into(), SliceOrIndex::from(..).step_by(2)],
-            &[(..).into(), SliceOrIndex::from(1..).step_by(3)],
-        ));
-        assert!(slices_intersect(
-            &Dim([4, 10]),
-            &[(..).into(), SliceOrIndex::from(..).step_by(9)],
-            &[(..).into(), SliceOrIndex::from(3..).step_by(6)],
-        ));
+        assert!(slices_intersect(&Dim([4, 5]), s![.., ..], s![.., ..]));
+        assert!(slices_intersect(&Dim([4, 5]), s![0, ..], s![0, ..]));
+        assert!(slices_intersect(&Dim([4, 5]), s![..;2, ..], s![..;3, ..]));
+        assert!(slices_intersect(&Dim([4, 5]), s![.., ..;2], s![.., 1..;3]));
+        assert!(slices_intersect(&Dim([4, 10]), s![.., ..;9], s![.., 3..;6]));
     }
 
     #[test]
     fn slices_intersect_false() {
-        assert!(!slices_intersect(
-            &Dim([4, 5]),
-            &[SliceOrIndex::from(..).step_by(2), (..).into()],
-            &[SliceOrIndex::from(1..).step_by(2), (..).into()],
-        ));
-        assert!(!slices_intersect(
-            &Dim([4, 5]),
-            &[SliceOrIndex::from(..).step_by(2), (..).into()],
-            &[SliceOrIndex::from(1..).step_by(3), (..).into()],
-        ));
-        assert!(!slices_intersect(
-            &Dim([4, 5]),
-            &[(..).into(), SliceOrIndex::from(..).step_by(9)],
-            &[(..).into(), SliceOrIndex::from(3..).step_by(6)],
-        ));
+        assert!(!slices_intersect(&Dim([4, 5]), s![..;2, ..], s![1..;2, ..]));
+        assert!(!slices_intersect(&Dim([4, 5]), s![..;2, ..], s![1..;3, ..]));
+        assert!(!slices_intersect(&Dim([4, 5]), s![.., ..;9], s![.., 3..;6]));
     }
 }

src/lib.rs

@@ -144,13 +144,11 @@ pub use data_traits::{
     DataClone,
 };
 
-mod dimension;
-
 mod free_functions;
 pub use free_functions::*;
 pub use iterators::iter;
 
-mod slice;
+#[macro_use] mod slice;
 mod layout;
 mod indexes;
 mod iterators;
@@ -162,6 +160,8 @@ mod shape_builder;
 mod stacking;
 mod zip;
 
+mod dimension;
+
 pub use zip::{
     Zip,
     NdProducer,