Change multislice tests to use multi_slice_* methods

Author: jturner314

tests/array.rs

@@ -345,39 +345,16 @@ fn test_slice_collapse_with_indices() {
 #[test]
 #[allow(clippy::cognitive_complexity)]
 fn test_multislice() {
-    defmac!(test_multislice mut arr, s1, s2 => {
-        {
-            let copy = arr.clone();
-            assert_eq!(
-                multislice!(arr, mut s1, mut s2,),
-                (copy.clone().slice_mut(s1), copy.clone().slice_mut(s2))
-            );
-        }
-        {
-            let copy = arr.clone();
-            assert_eq!(
-                multislice!(arr, mut s1, s2,),
-                (copy.clone().slice_mut(s1), copy.clone().slice(s2))
-            );
-        }
-        {
-            let copy = arr.clone();
-            assert_eq!(
-                multislice!(arr, s1, mut s2),
-                (copy.clone().slice(s1), copy.clone().slice_mut(s2))
-            );
-        }
-        {
-            let copy = arr.clone();
-            assert_eq!(
-                multislice!(arr, s1, s2),
-                (copy.clone().slice(s1), copy.clone().slice(s2))
-            );
-        }
+    defmac!(test_multislice arr, s1, s2 => {
+        let copy = arr.clone();
+        assert_eq!(
+            arr.multi_slice_mut((s1, s2)),
+            (copy.clone().slice_mut(s1), copy.clone().slice_mut(s2))
+        );
     });
     let mut arr = Array1::from_iter(0..48).into_shape((8, 6)).unwrap();
 
-    assert_eq!((arr.clone().view(),), multislice!(arr, [.., ..]));
+    assert_eq!(arr.clone().view(), arr.multi_slice_mut(s![.., ..]));
     test_multislice!(&mut arr, s![0, ..], s![1, ..]);
     test_multislice!(&mut arr, s![0, ..], s![-1, ..]);
     test_multislice!(&mut arr, s![0, ..], s![1.., ..]);
@@ -392,87 +369,28 @@ fn test_multislice() {
 fn test_multislice_intersecting() {
     assert_panics!({
         let mut arr = Array2::<u8>::zeros((8, 6));
-        multislice!(arr, mut [3, ..], [3, ..]);
+        arr.multi_slice_mut((s![3, ..], s![3, ..]));
     });
     assert_panics!({
         let mut arr = Array2::<u8>::zeros((8, 6));
-        multislice!(arr, mut [3, ..], [3.., ..]);
+        arr.multi_slice_mut((s![3, ..], s![3.., ..]));
     });
     assert_panics!({
         let mut arr = Array2::<u8>::zeros((8, 6));
-        multislice!(arr, mut [3, ..], [..;3, ..]);
+        arr.multi_slice_mut((s![3, ..], s![..;3, ..]));
     });
     assert_panics!({
         let mut arr = Array2::<u8>::zeros((8, 6));
-        multislice!(arr, mut [..;6, ..], [3..;3, ..]);
+        arr.multi_slice_mut((s![..;6, ..], s![3..;3, ..]));
     });
     assert_panics!({
         let mut arr = Array2::<u8>::zeros((8, 6));
-        multislice!(arr, mut [2, ..], mut [..-1;-2, ..]);
+        arr.multi_slice_mut((s![2, ..], s![..-1;-2, ..]));
     });
     {
         let mut arr = Array2::<u8>::zeros((8, 6));
-        multislice!(arr, [3, ..], [-1..;-2, ..]);
-    }
-}
-
-#[test]
-fn test_multislice_eval_args_only_once() {
-    let mut arr = Array1::<u8>::zeros(10);
-    let mut eval_count = 0;
-    {
-        let mut slice = || {
-            eval_count += 1;
-            *s![1..2]
-        };
-        multislice!(arr, mut &slice(), [3..4], [5..6]);
-    }
-    assert_eq!(eval_count, 1);
-    let mut eval_count = 0;
-    {
-        let mut slice = || {
-            eval_count += 1;
-            *s![1..2]
-        };
-        multislice!(arr, [3..4], mut &slice(), [5..6]);
+        arr.multi_slice_mut((s![3, ..], s![-1..;-2, ..]));
     }
-    assert_eq!(eval_count, 1);
-    let mut eval_count = 0;
-    {
-        let mut slice = || {
-            eval_count += 1;
-            *s![1..2]
-        };
-        multislice!(arr, [3..4], [5..6], mut &slice());
-    }
-    assert_eq!(eval_count, 1);
-    let mut eval_count = 0;
-    {
-        let mut slice = || {
-            eval_count += 1;
-            *s![1..2]
-        };
-        multislice!(arr, &slice(), mut [3..4], [5..6]);
-    }
-    assert_eq!(eval_count, 1);
-    let mut eval_count = 0;
-    {
-        let mut slice = || {
-            eval_count += 1;
-            *s![1..2]
-        };
-        multislice!(arr, mut [3..4], &slice(), [5..6]);
-    }
-    assert_eq!(eval_count, 1);
-    let mut eval_count = 0;
-    {
-        let mut slice = || {
-            eval_count += 1;
-            *s![1..2]
-        };
-        multislice!(arr, mut [3..4], [5..6], &slice());
-    }
-    assert_eq!(eval_count, 1);
 }
 
 #[should_panic]