Skip to content

Commit f51f3e4

Browse files
committed
API: Remove deprecated subview and indexing methods
We had renamed subview_inplace to collapse_axis (deprecating the old name). We had renamed subview_mut toindex_axis_mut (deprecating the old name). We had renamed into_subview to index_axis_move (deprecating the old name). We had renamed subview to index_axis (deprecating the old name). We had renamed slice_inplace to slice_collapse (deprecating the old name). UNdeprecate remove_axis because its replacement is quite cryptic.
1 parent 8fec0eb commit f51f3e4

File tree

1 file changed

+3
-55
lines changed

1 file changed

+3
-55
lines changed

src/impl_methods.rs

Lines changed: 3 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -456,15 +456,6 @@ where
456456
});
457457
}
458458

459-
/// Slice the array in place without changing the number of dimensions.
460-
///
461-
/// **Panics** if an index is out of bounds or step size is zero.<br>
462-
/// (**Panics** if `D` is `IxDyn` and `indices` does not match the number of array axes.)
463-
#[deprecated(note = "renamed to `slice_collapse`", since = "0.12.1")]
464-
pub fn slice_inplace(&mut self, indices: &D::SliceArg) {
465-
self.slice_collapse(indices)
466-
}
467-
468459
/// Return a view of the array, sliced along the specified axis.
469460
///
470461
/// **Panics** if an index is out of bounds or step size is zero.<br>
@@ -759,51 +750,6 @@ where
759750
debug_assert!(self.pointer_is_inbounds());
760751
}
761752

762-
/// Along `axis`, select the subview `index` and return a
763-
/// view with that axis removed.
764-
///
765-
/// **Panics** if `axis` or `index` is out of bounds.
766-
#[deprecated(note = "renamed to `index_axis`", since = "0.12.1")]
767-
pub fn subview(&self, axis: Axis, index: Ix) -> ArrayView<'_, A, D::Smaller>
768-
where
769-
S: Data,
770-
D: RemoveAxis,
771-
{
772-
self.index_axis(axis, index)
773-
}
774-
775-
/// Along `axis`, select the subview `index` and return a read-write view
776-
/// with the axis removed.
777-
///
778-
/// **Panics** if `axis` or `index` is out of bounds.
779-
#[deprecated(note = "renamed to `index_axis_mut`", since = "0.12.1")]
780-
pub fn subview_mut(&mut self, axis: Axis, index: Ix) -> ArrayViewMut<'_, A, D::Smaller>
781-
where
782-
S: DataMut,
783-
D: RemoveAxis,
784-
{
785-
self.index_axis_mut(axis, index)
786-
}
787-
788-
/// Collapse dimension `axis` into length one,
789-
/// and select the subview of `index` along that axis.
790-
///
791-
/// **Panics** if `index` is past the length of the axis.
792-
#[deprecated(note = "renamed to `collapse_axis`", since = "0.12.1")]
793-
pub fn subview_inplace(&mut self, axis: Axis, index: Ix) {
794-
self.collapse_axis(axis, index)
795-
}
796-
797-
/// Along `axis`, select the subview `index` and return `self`
798-
/// with that axis removed.
799-
#[deprecated(note = "renamed to `index_axis_move`", since = "0.12.1")]
800-
pub fn into_subview(self, axis: Axis, index: Ix) -> ArrayBase<S, D::Smaller>
801-
where
802-
D: RemoveAxis,
803-
{
804-
self.index_axis_move(axis, index)
805-
}
806-
807753
/// Along `axis`, select arbitrary subviews corresponding to `indices`
808754
/// and and copy them into a new array.
809755
///
@@ -1886,8 +1832,10 @@ where
18861832

18871833
/// Remove array axis `axis` and return the result.
18881834
///
1835+
/// This is equivalent to `.index-axis_move(axis, 0)` and makes most sense to use if the
1836+
/// axis to remove is of length 1.
1837+
///
18891838
/// **Panics** if the axis is out of bounds or its length is zero.
1890-
#[deprecated(note = "use `.index_axis_move(Axis(_), 0)` instead", since = "0.12.1")]
18911839
pub fn remove_axis(self, axis: Axis) -> ArrayBase<S, D::Smaller>
18921840
where
18931841
D: RemoveAxis,

0 commit comments

Comments
 (0)