Rename into_subview to index_axis_move

Author: jturner314

src/impl_methods.rs

@@ -571,7 +571,19 @@ impl<A, S, D> ArrayBase<S, D> where S: Data<Elem=A>, D: Dimension
         S: DataMut,
         D: RemoveAxis,
     {
-        self.view_mut().into_subview(axis, index)
+        self.view_mut().index_axis_move(axis, index)
+    }
+
+    /// Along `axis`, select the subview `index` and return `self`
+    /// with that axis removed.
+    ///
+    /// See [`.subview()`](#method.subview) and [*Subviews*](#subviews) for full documentation.
+    pub fn index_axis_move(mut self, axis: Axis, index: usize) -> ArrayBase<S, D::Smaller>
+    where
+        D: RemoveAxis,
+    {
+        self.collapse_axis(axis, index);
+        self.remove_axis(axis)
     }
 
     /// Collapse the axis into length one, selecting the subview at the given
@@ -607,7 +619,7 @@ impl<A, S, D> ArrayBase<S, D> where S: Data<Elem=A>, D: Dimension
     pub fn subview(&self, axis: Axis, index: Ix) -> ArrayView<A, D::Smaller>
         where D: RemoveAxis,
     {
-        self.view().into_subview(axis, index)
+        self.view().index_axis_move(axis, index)
     }
 
     /// Along `axis`, select the subview `index` and return a read-write view
@@ -634,13 +646,11 @@ impl<A, S, D> ArrayBase<S, D> where S: Data<Elem=A>, D: Dimension
 
     /// Along `axis`, select the subview `index` and return `self`
     /// with that axis removed.
-    ///
-    /// See [`.subview()`](#method.subview) and [*Subviews*](#subviews) for full documentation.
-    pub fn into_subview(mut self, axis: Axis, index: Ix) -> ArrayBase<S, D::Smaller>
+    #[deprecated(note="renamed to `index_axis_move`", since="0.12.1")]
+    pub fn into_subview(self, axis: Axis, index: Ix) -> ArrayBase<S, D::Smaller>
         where D: RemoveAxis,
     {
-        self.collapse_axis(axis, index);
-        self.remove_axis(axis)
+        self.index_axis_move(axis, index)
     }
 
     /// Along `axis`, select arbitrary subviews corresponding to `indices`

src/lib.rs

@@ -521,15 +521,15 @@ pub type Ixs = isize;
 ///
 /// Subview methods allow you to restrict the array view while removing one
 /// axis from the array. Subview methods include [`.subview()`],
-/// [`.index_axis_mut()`], [`.into_subview()`], and [`.collapse_axis()`]. You
+/// [`.index_axis_mut()`], [`.index_axis_move()`], and [`.collapse_axis()`]. You
 /// can also take a subview by using a single index instead of a range when
 /// slicing.
 ///
 /// Subview takes two arguments: `axis` and `index`.
 ///
 /// [`.subview()`]: #method.subview
 /// [`.index_axis_mut()`]: #method.index_axis_mut
-/// [`.into_subview()`]: #method.into_subview
+/// [`.index_axis_move()`]: #method.index_axis_move
 /// [`.collapse_axis()`]: #method.collapse_axis
 ///
 /// ```

tests/array.rs

@@ -590,7 +590,7 @@ fn swapaxes()
 #[test]
 fn permuted_axes()
 {
-    let a = array![1].into_subview(Axis(0), 0);
+    let a = array![1].index_axis_move(Axis(0), 0);
     let permuted = a.view().permuted_axes([]);
     assert_eq!(a, permuted);
 
@@ -932,14 +932,14 @@ fn as_slice_memory_order()
 fn array0_into_scalar() {
     // With this kind of setup, the `Array`'s pointer is not the same as the
     // underlying `Vec`'s pointer.
-    let a: Array0<i32> = array![4, 5, 6, 7].into_subview(Axis(0), 2);
+    let a: Array0<i32> = array![4, 5, 6, 7].index_axis_move(Axis(0), 2);
     assert_ne!(a.as_ptr(), a.into_raw_vec().as_ptr());
     // `.into_scalar()` should still work correctly.
-    let a: Array0<i32> = array![4, 5, 6, 7].into_subview(Axis(0), 2);
+    let a: Array0<i32> = array![4, 5, 6, 7].index_axis_move(Axis(0), 2);
     assert_eq!(a.into_scalar(), 6);
 
     // It should work for zero-size elements too.
-    let a: Array0<()> = array![(), (), (), ()].into_subview(Axis(0), 2);
+    let a: Array0<()> = array![(), (), (), ()].index_axis_move(Axis(0), 2);
     assert_eq!(a.into_scalar(), ());
 }
 

tests/dimension.rs

@@ -56,7 +56,7 @@ fn remove_axis()
     a.subview(Axis(1), 0);
 
     let a = RcArray::<f32, _>::zeros(vec![4,5,6]);
-    let _b = a.into_subview(Axis(1), 0).reshape((4, 6)).reshape(vec![2, 3, 4]);
+    let _b = a.index_axis_move(Axis(1), 0).reshape((4, 6)).reshape(vec![2, 3, 4]);
 }
 
 #[test]