Remove extra parentheses from multislice! macro

Author: jturner314

src/lib.rs

@@ -533,7 +533,7 @@ pub type Ixs = isize;
 /// // - One containing all the odd-index columns in the matrix
 /// let mut h = arr2(&[[0, 1, 2, 3],
 ///                    [4, 5, 6, 7]]);
-/// let (s0, s1) = multislice!(h, (mut [.., ..;2], mut [.., 1..;2]));
+/// let (s0, s1) = multislice!(h, mut [.., ..;2], mut [.., 1..;2]);
 /// let i = arr2(&[[0, 2],
 ///                [4, 6]]);
 /// let j = arr2(&[[1, 3],

src/slice.rs

@@ -661,7 +661,7 @@ pub unsafe fn deref_raw_view_mut_into_view_mut_with_life<'a, A, D: Dimension>(
 /// borrowing the array twice (even though it's safe as long as the slices are
 /// disjoint).
 ///
-/// The syntax is `multislice!(` *expression, (pattern [, pattern [, …]])* `)`,
+/// The syntax is `multislice!(` *expression, pattern [, pattern [, …]]* `)`,
 /// where *expression* evaluates to a mutable array, and each *pattern* is
 /// either
 ///
@@ -702,7 +702,7 @@ pub unsafe fn deref_raw_view_mut_into_view_mut_with_life<'a, A, D: Dimension>(
 ///
 /// # fn main() {
 /// let mut arr = Array1::from_iter(0..12);
-/// let (a, b, c, d) = multislice!(arr, ([0..5], mut [6..;2], [1..6], mut [7..;2]));
+/// let (a, b, c, d) = multislice!(arr, [0..5], mut [6..;2], [1..6], mut [7..;2]);
 /// assert_eq!(a, array![0, 1, 2, 3, 4]);
 /// assert_eq!(b, array![6, 8, 10]);
 /// assert_eq!(c, array![1, 2, 3, 4, 5]);
@@ -720,7 +720,7 @@ pub unsafe fn deref_raw_view_mut_into_view_mut_with_life<'a, A, D: Dimension>(
 ///   # use ndarray::prelude::*;
 ///   # fn main() {
 ///   let mut arr = Array1::from_iter(0..12);
-///   multislice!(arr, ([0..5], mut [1..;2])); // panic!
+///   multislice!(arr, [0..5], mut [1..;2]); // panic!
 ///   # }
 ///   ```
 ///
@@ -732,7 +732,7 @@ pub unsafe fn deref_raw_view_mut_into_view_mut_with_life<'a, A, D: Dimension>(
 ///   # use ndarray::prelude::*;
 ///   # fn main() {
 ///   let mut arr = Array1::from_iter(0..12);
-///   multislice!(arr, (mut [0..5], mut [1..;2])); // panic!
+///   multislice!(arr, mut [0..5], mut [1..;2]); // panic!
 ///   # }
 ///   ```
 #[macro_export]
@@ -987,7 +987,7 @@ macro_rules! multislice(
         }
     };
     // Entry point.
-    ($arr:expr, ($($t:tt)*)) => {
+    ($arr:expr, $($t:tt)*) => {
         {
             let (life, raw_view) = {
                 let mut view = $crate::ArrayBase::view_mut(&mut $arr);

tests/array.rs

@@ -335,35 +335,35 @@ fn test_multislice() {
         {
             let copy = arr.clone();
             assert_eq!(
-                multislice!(arr, (mut s1, mut s2,)),
+                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,)),
+                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)),
+                multislice!(arr, s1, mut s2),
                 (copy.clone().slice(s1), copy.clone().slice_mut(s2))
             );
         }
         {
             let copy = arr.clone();
             assert_eq!(
-                multislice!(arr, (s1, s2)),
+                multislice!(arr, s1, s2),
                 (copy.clone().slice(s1), copy.clone().slice(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(),), multislice!(arr, [.., ..]));
     test_multislice!(&mut arr, s![0, ..], s![1, ..]);
     test_multislice!(&mut arr, s![0, ..], s![-1, ..]);
     test_multislice!(&mut arr, s![0, ..], s![1.., ..]);
@@ -378,27 +378,27 @@ fn test_multislice() {
 fn test_multislice_intersecting() {
     assert_panics!({
         let mut arr = Array2::<u8>::zeros((8, 6));
-        multislice!(arr, (mut [3, ..], [3, ..]));
+        multislice!(arr, mut [3, ..], [3, ..]);
     });
     assert_panics!({
         let mut arr = Array2::<u8>::zeros((8, 6));
-        multislice!(arr, (mut [3, ..], [3.., ..]));
+        multislice!(arr, mut [3, ..], [3.., ..]);
     });
     assert_panics!({
         let mut arr = Array2::<u8>::zeros((8, 6));
-        multislice!(arr, (mut [3, ..], [..;3, ..]));
+        multislice!(arr, mut [3, ..], [..;3, ..]);
     });
     assert_panics!({
         let mut arr = Array2::<u8>::zeros((8, 6));
-        multislice!(arr, (mut [..;6, ..], [3..;3, ..]));
+        multislice!(arr, mut [..;6, ..], [3..;3, ..]);
     });
     assert_panics!({
         let mut arr = Array2::<u8>::zeros((8, 6));
-        multislice!(arr, (mut [2, ..], mut [..-1;-2, ..]));
+        multislice!(arr, mut [2, ..], mut [..-1;-2, ..]);
     });
     {
         let mut arr = Array2::<u8>::zeros((8, 6));
-        multislice!(arr, ([3, ..], [-1..;-2, ..]));
+        multislice!(arr, [3, ..], [-1..;-2, ..]);
     }
 }
 
@@ -411,7 +411,7 @@ fn test_multislice_eval_args_only_once() {
             eval_count += 1;
             s![1..2].clone()
         };
-        multislice!(arr, (mut &slice(), [3..4], [5..6]));
+        multislice!(arr, mut &slice(), [3..4], [5..6]);
     }
     assert_eq!(eval_count, 1);
     let mut eval_count = 0;
@@ -420,7 +420,7 @@ fn test_multislice_eval_args_only_once() {
             eval_count += 1;
             s![1..2].clone()
         };
-        multislice!(arr, ([3..4], mut &slice(), [5..6]));
+        multislice!(arr, [3..4], mut &slice(), [5..6]);
     }
     assert_eq!(eval_count, 1);
     let mut eval_count = 0;
@@ -429,7 +429,7 @@ fn test_multislice_eval_args_only_once() {
             eval_count += 1;
             s![1..2].clone()
         };
-        multislice!(arr, ([3..4], [5..6], mut &slice()));
+        multislice!(arr, [3..4], [5..6], mut &slice());
     }
     assert_eq!(eval_count, 1);
     let mut eval_count = 0;
@@ -438,7 +438,7 @@ fn test_multislice_eval_args_only_once() {
             eval_count += 1;
             s![1..2].clone()
         };
-        multislice!(arr, (&slice(), mut [3..4], [5..6]));
+        multislice!(arr, &slice(), mut [3..4], [5..6]);
     }
     assert_eq!(eval_count, 1);
     let mut eval_count = 0;
@@ -447,7 +447,7 @@ fn test_multislice_eval_args_only_once() {
             eval_count += 1;
             s![1..2].clone()
         };
-        multislice!(arr, (mut [3..4], &slice(), [5..6]));
+        multislice!(arr, mut [3..4], &slice(), [5..6]);
     }
     assert_eq!(eval_count, 1);
     let mut eval_count = 0;
@@ -456,7 +456,7 @@ fn test_multislice_eval_args_only_once() {
             eval_count += 1;
             s![1..2].clone()
         };
-        multislice!(arr, (mut [3..4], [5..6], &slice()));
+        multislice!(arr, mut [3..4], [5..6], &slice());
     }
     assert_eq!(eval_count, 1);
 }