Skip to content

Commit da3db9a

Browse files
committed
Rename MaybeUninit::write_slice
rust-lang#79995
1 parent ed086d8 commit da3db9a

File tree

5 files changed

+22
-22
lines changed

5 files changed

+22
-22
lines changed

Diff for: library/core/src/io/borrowed_buf.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ impl<'a> BorrowedCursor<'a> {
289289

290290
// SAFETY: we do not de-initialize any of the elements of the slice
291291
unsafe {
292-
MaybeUninit::write_slice(&mut self.as_mut()[..buf.len()], buf);
292+
MaybeUninit::copy_from_slice(&mut self.as_mut()[..buf.len()], buf);
293293
}
294294

295295
// SAFETY: We just added the entire contents of buf to the filled section.

Diff for: library/core/src/mem/maybe_uninit.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,7 @@ impl<T> MaybeUninit<T> {
10191019

10201020
/// Copies the elements from `src` to `this`, returning a mutable reference to the now initialized contents of `this`.
10211021
///
1022-
/// If `T` does not implement `Copy`, use [`write_slice_cloned`]
1022+
/// If `T` does not implement `Copy`, use [`clone_from_slice`]
10231023
///
10241024
/// This is similar to [`slice::copy_from_slice`].
10251025
///
@@ -1036,7 +1036,7 @@ impl<T> MaybeUninit<T> {
10361036
/// let mut dst = [MaybeUninit::uninit(); 32];
10371037
/// let src = [0; 32];
10381038
///
1039-
/// let init = MaybeUninit::write_slice(&mut dst, &src);
1039+
/// let init = MaybeUninit::copy_from_slice(&mut dst, &src);
10401040
///
10411041
/// assert_eq!(init, src);
10421042
/// ```
@@ -1048,7 +1048,7 @@ impl<T> MaybeUninit<T> {
10481048
/// let mut vec = Vec::with_capacity(32);
10491049
/// let src = [0; 16];
10501050
///
1051-
/// MaybeUninit::write_slice(&mut vec.spare_capacity_mut()[..src.len()], &src);
1051+
/// MaybeUninit::copy_from_slice(&mut vec.spare_capacity_mut()[..src.len()], &src);
10521052
///
10531053
/// // SAFETY: we have just copied all the elements of len into the spare capacity
10541054
/// // the first src.len() elements of the vec are valid now.
@@ -1059,9 +1059,9 @@ impl<T> MaybeUninit<T> {
10591059
/// assert_eq!(vec, src);
10601060
/// ```
10611061
///
1062-
/// [`write_slice_cloned`]: MaybeUninit::write_slice_cloned
1062+
/// [`clone_from_slice`]: MaybeUninit::clone_from_slice
10631063
#[unstable(feature = "maybe_uninit_write_slice", issue = "79995")]
1064-
pub fn write_slice<'a>(this: &'a mut [MaybeUninit<T>], src: &[T]) -> &'a mut [T]
1064+
pub fn copy_from_slice<'a>(this: &'a mut [MaybeUninit<T>], src: &[T]) -> &'a mut [T]
10651065
where
10661066
T: Copy,
10671067
{
@@ -1077,7 +1077,7 @@ impl<T> MaybeUninit<T> {
10771077
/// Clones the elements from `src` to `this`, returning a mutable reference to the now initialized contents of `this`.
10781078
/// Any already initialized elements will not be dropped.
10791079
///
1080-
/// If `T` implements `Copy`, use [`write_slice`]
1080+
/// If `T` implements `Copy`, use [`copy_from_slice`]
10811081
///
10821082
/// This is similar to [`slice::clone_from_slice`] but does not drop existing elements.
10831083
///
@@ -1096,7 +1096,7 @@ impl<T> MaybeUninit<T> {
10961096
/// let mut dst = [MaybeUninit::uninit(), MaybeUninit::uninit(), MaybeUninit::uninit(), MaybeUninit::uninit(), MaybeUninit::uninit()];
10971097
/// let src = ["wibbly".to_string(), "wobbly".to_string(), "timey".to_string(), "wimey".to_string(), "stuff".to_string()];
10981098
///
1099-
/// let init = MaybeUninit::write_slice_cloned(&mut dst, &src);
1099+
/// let init = MaybeUninit::clone_from_slice(&mut dst, &src);
11001100
///
11011101
/// assert_eq!(init, src);
11021102
/// ```
@@ -1108,7 +1108,7 @@ impl<T> MaybeUninit<T> {
11081108
/// let mut vec = Vec::with_capacity(32);
11091109
/// let src = ["rust", "is", "a", "pretty", "cool", "language"];
11101110
///
1111-
/// MaybeUninit::write_slice_cloned(&mut vec.spare_capacity_mut()[..src.len()], &src);
1111+
/// MaybeUninit::clone_from_slice(&mut vec.spare_capacity_mut()[..src.len()], &src);
11121112
///
11131113
/// // SAFETY: we have just cloned all the elements of len into the spare capacity
11141114
/// // the first src.len() elements of the vec are valid now.
@@ -1119,9 +1119,9 @@ impl<T> MaybeUninit<T> {
11191119
/// assert_eq!(vec, src);
11201120
/// ```
11211121
///
1122-
/// [`write_slice`]: MaybeUninit::write_slice
1122+
/// [`copy_from_slice`]: MaybeUninit::copy_from_slice
11231123
#[unstable(feature = "maybe_uninit_write_slice", issue = "79995")]
1124-
pub fn write_slice_cloned<'a>(this: &'a mut [MaybeUninit<T>], src: &[T]) -> &'a mut [T]
1124+
pub fn clone_from_slice<'a>(this: &'a mut [MaybeUninit<T>], src: &[T]) -> &'a mut [T]
11251125
where
11261126
T: Clone,
11271127
{
@@ -1264,7 +1264,7 @@ impl<T> MaybeUninit<T> {
12641264
///
12651265
/// let mut uninit = [MaybeUninit::<u16>::uninit(), MaybeUninit::<u16>::uninit()];
12661266
/// let uninit_bytes = MaybeUninit::slice_as_bytes_mut(&mut uninit);
1267-
/// MaybeUninit::write_slice(uninit_bytes, &[0x12, 0x34, 0x56, 0x78]);
1267+
/// MaybeUninit::copy_from_slice(uninit_bytes, &[0x12, 0x34, 0x56, 0x78]);
12681268
/// let vals = unsafe { MaybeUninit::slice_assume_init_ref(&uninit) };
12691269
/// if cfg!(target_endian = "little") {
12701270
/// assert_eq!(vals, &[0x3412u16, 0x7856u16]);

Diff for: library/core/src/net/display_buffer.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ impl<const SIZE: usize> fmt::Write for DisplayBuffer<SIZE> {
3030
let bytes = s.as_bytes();
3131

3232
if let Some(buf) = self.buf.get_mut(self.len..(self.len + bytes.len())) {
33-
MaybeUninit::write_slice(buf, bytes);
33+
MaybeUninit::copy_from_slice(buf, bytes);
3434
self.len += bytes.len();
3535
Ok(())
3636
} else {

Diff for: library/core/tests/mem.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ fn uninit_write_slice() {
205205
let mut dst = [MaybeUninit::new(255); 64];
206206
let src = [0; 64];
207207

208-
assert_eq!(MaybeUninit::write_slice(&mut dst, &src), &src);
208+
assert_eq!(MaybeUninit::copy_from_slice(&mut dst, &src), &src);
209209
}
210210

211211
#[test]
@@ -214,7 +214,7 @@ fn uninit_write_slice_panic_lt() {
214214
let mut dst = [MaybeUninit::uninit(); 64];
215215
let src = [0; 32];
216216

217-
MaybeUninit::write_slice(&mut dst, &src);
217+
MaybeUninit::copy_from_slice(&mut dst, &src);
218218
}
219219

220220
#[test]
@@ -223,15 +223,15 @@ fn uninit_write_slice_panic_gt() {
223223
let mut dst = [MaybeUninit::uninit(); 64];
224224
let src = [0; 128];
225225

226-
MaybeUninit::write_slice(&mut dst, &src);
226+
MaybeUninit::copy_from_slice(&mut dst, &src);
227227
}
228228

229229
#[test]
230230
fn uninit_clone_from_slice() {
231231
let mut dst = [MaybeUninit::new(255); 64];
232232
let src = [0; 64];
233233

234-
assert_eq!(MaybeUninit::write_slice_cloned(&mut dst, &src), &src);
234+
assert_eq!(MaybeUninit::clone_from_slice(&mut dst, &src), &src);
235235
}
236236

237237
#[test]
@@ -240,7 +240,7 @@ fn uninit_write_slice_cloned_panic_lt() {
240240
let mut dst = [MaybeUninit::uninit(); 64];
241241
let src = [0; 32];
242242

243-
MaybeUninit::write_slice_cloned(&mut dst, &src);
243+
MaybeUninit::clone_from_slice(&mut dst, &src);
244244
}
245245

246246
#[test]
@@ -249,7 +249,7 @@ fn uninit_write_slice_cloned_panic_gt() {
249249
let mut dst = [MaybeUninit::uninit(); 64];
250250
let src = [0; 128];
251251

252-
MaybeUninit::write_slice_cloned(&mut dst, &src);
252+
MaybeUninit::clone_from_slice(&mut dst, &src);
253253
}
254254

255255
#[test]
@@ -290,7 +290,7 @@ fn uninit_write_slice_cloned_mid_panic() {
290290
];
291291

292292
let err = panic::catch_unwind(panic::AssertUnwindSafe(|| {
293-
MaybeUninit::write_slice_cloned(&mut dst, &src);
293+
MaybeUninit::clone_from_slice(&mut dst, &src);
294294
}));
295295

296296
drop(src);
@@ -322,7 +322,7 @@ fn uninit_write_slice_cloned_no_drop() {
322322
let mut dst = [MaybeUninit::uninit()];
323323
let src = [Bomb];
324324

325-
MaybeUninit::write_slice_cloned(&mut dst, &src);
325+
MaybeUninit::clone_from_slice(&mut dst, &src);
326326

327327
forget(src);
328328
}

Diff for: library/proc_macro/src/bridge/arena.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ impl Arena {
104104

105105
pub(crate) fn alloc_str<'a>(&'a self, string: &str) -> &'a mut str {
106106
let alloc = self.alloc_raw(string.len());
107-
let bytes = MaybeUninit::write_slice(alloc, string.as_bytes());
107+
let bytes = MaybeUninit::copy_from_slice(alloc, string.as_bytes());
108108

109109
// SAFETY: we convert from `&str` to `&[u8]`, clone it into the arena,
110110
// and immediately convert the clone back to `&str`.

0 commit comments

Comments
 (0)