about summary refs log tree commit diff
path: root/library/core/src/array
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2020-09-01 23:16:51 +0200
committerRalf Jung <post@ralfj.de>2020-09-05 17:24:22 +0200
commitcff5f56886b60bab024d51d26866e99a293da56b (patch)
tree60b3d772f9a59ed908b51564b954db5f7e0e292d /library/core/src/array
parent81a769f261047afd8e31cc488b173b0ab5ac4205 (diff)
downloadrust-cff5f56886b60bab024d51d26866e99a293da56b.tar.gz
rust-cff5f56886b60bab024d51d26866e99a293da56b.zip
rename MaybeUninit slice methods
first_ptr -> slice_as_ptr
first_ptr_mut -> slice_as_mut_ptr
slice_get_ref -> slice_assume_init_ref
slice_get_mut -> slice_assume_init_mut
Diffstat (limited to 'library/core/src/array')
-rw-r--r--library/core/src/array/iter.rs4
-rw-r--r--library/core/src/array/mod.rs2
2 files changed, 3 insertions, 3 deletions
diff --git a/library/core/src/array/iter.rs b/library/core/src/array/iter.rs
index 919070aadf9..2e8b6419eea 100644
--- a/library/core/src/array/iter.rs
+++ b/library/core/src/array/iter.rs
@@ -73,7 +73,7 @@ impl<T, const N: usize> IntoIter<T, N> {
         // SAFETY: We know that all elements within `alive` are properly initialized.
         unsafe {
             let slice = self.data.get_unchecked(self.alive.clone());
-            MaybeUninit::slice_get_ref(slice)
+            MaybeUninit::slice_assume_init_ref(slice)
         }
     }
 
@@ -82,7 +82,7 @@ impl<T, const N: usize> IntoIter<T, N> {
         // SAFETY: We know that all elements within `alive` are properly initialized.
         unsafe {
             let slice = self.data.get_unchecked_mut(self.alive.clone());
-            MaybeUninit::slice_get_mut(slice)
+            MaybeUninit::slice_assume_init_mut(slice)
         }
     }
 }
diff --git a/library/core/src/array/mod.rs b/library/core/src/array/mod.rs
index f45c99c285c..c1d3aca6fdd 100644
--- a/library/core/src/array/mod.rs
+++ b/library/core/src/array/mod.rs
@@ -410,7 +410,7 @@ impl<T, const N: usize> [T; N] {
         }
         let mut dst = MaybeUninit::uninit_array::<N>();
         let mut guard: Guard<U, N> =
-            Guard { dst: MaybeUninit::first_ptr_mut(&mut dst), initialized: 0 };
+            Guard { dst: MaybeUninit::slice_as_mut_ptr(&mut dst), initialized: 0 };
         for (src, dst) in IntoIter::new(self).zip(&mut dst) {
             dst.write(f(src));
             guard.initialized += 1;