From facc0bb78ee53895b26a06aee981fa55eb92dd9a Mon Sep 17 00:00:00 2001 From: Scott McMurray Date: Wed, 15 May 2024 23:39:33 -0700 Subject: [PATCH] =?UTF-8?q?Rename=20`flatten(=5Fmut)`=20=E2=86=92=20`as=5F?= =?UTF-8?q?flattened(=5Fmut)`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/core/src/slice/mod.rs | 16 ++++++++-------- library/core/tests/slice.rs | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/library/core/src/slice/mod.rs b/library/core/src/slice/mod.rs index 9bee50424b3d6..f82f965e67cf4 100644 --- a/library/core/src/slice/mod.rs +++ b/library/core/src/slice/mod.rs @@ -4533,21 +4533,21 @@ impl [[T; N]] { /// ``` /// #![feature(slice_flatten)] /// - /// assert_eq!([[1, 2, 3], [4, 5, 6]].flatten(), &[1, 2, 3, 4, 5, 6]); + /// assert_eq!([[1, 2, 3], [4, 5, 6]].as_flattened(), &[1, 2, 3, 4, 5, 6]); /// /// assert_eq!( - /// [[1, 2, 3], [4, 5, 6]].flatten(), - /// [[1, 2], [3, 4], [5, 6]].flatten(), + /// [[1, 2, 3], [4, 5, 6]].as_flattened(), + /// [[1, 2], [3, 4], [5, 6]].as_flattened(), /// ); /// /// let slice_of_empty_arrays: &[[i32; 0]] = &[[], [], [], [], []]; - /// assert!(slice_of_empty_arrays.flatten().is_empty()); + /// assert!(slice_of_empty_arrays.as_flattened().is_empty()); /// /// let empty_slice_of_arrays: &[[u32; 10]] = &[]; - /// assert!(empty_slice_of_arrays.flatten().is_empty()); + /// assert!(empty_slice_of_arrays.as_flattened().is_empty()); /// ``` #[unstable(feature = "slice_flatten", issue = "95629")] - pub const fn flatten(&self) -> &[T] { + pub const fn as_flattened(&self) -> &[T] { let len = if T::IS_ZST { self.len().checked_mul(N).expect("slice len overflow") } else { @@ -4581,11 +4581,11 @@ impl [[T; N]] { /// } /// /// let mut array = [[1, 2, 3], [4, 5, 6], [7, 8, 9]]; - /// add_5_to_all(array.flatten_mut()); + /// add_5_to_all(array.as_flattened_mut()); /// assert_eq!(array, [[6, 7, 8], [9, 10, 11], [12, 13, 14]]); /// ``` #[unstable(feature = "slice_flatten", issue = "95629")] - pub fn flatten_mut(&mut self) -> &mut [T] { + pub fn as_flattened_mut(&mut self) -> &mut [T] { let len = if T::IS_ZST { self.len().checked_mul(N).expect("slice len overflow") } else { diff --git a/library/core/tests/slice.rs b/library/core/tests/slice.rs index ffe8ffcc7f2f7..c91ac2fbb43b0 100644 --- a/library/core/tests/slice.rs +++ b/library/core/tests/slice.rs @@ -2609,14 +2609,14 @@ fn test_slice_from_ptr_range() { #[should_panic = "slice len overflow"] fn test_flatten_size_overflow() { let x = &[[(); usize::MAX]; 2][..]; - let _ = x.flatten(); + let _ = x.as_flattened(); } #[test] #[should_panic = "slice len overflow"] fn test_flatten_mut_size_overflow() { let x = &mut [[(); usize::MAX]; 2][..]; - let _ = x.flatten_mut(); + let _ = x.as_flattened_mut(); } #[test]