mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-25 00:03:43 +00:00
Auto merge of #116385 - kornelski:maybe-rename, r=Amanieu
Rename MaybeUninit::write_slice A step to push #79995 forward. https://github.com/rust-lang/libs-team/issues/122 also suggested to make them inherent methods, but they can't be — they'd conflict with slice's regular methods.
This commit is contained in:
commit
ae9d7b0c64
@ -289,7 +289,7 @@ impl<'a> BorrowedCursor<'a> {
|
|||||||
|
|
||||||
// SAFETY: we do not de-initialize any of the elements of the slice
|
// SAFETY: we do not de-initialize any of the elements of the slice
|
||||||
unsafe {
|
unsafe {
|
||||||
MaybeUninit::write_slice(&mut self.as_mut()[..buf.len()], buf);
|
MaybeUninit::copy_from_slice(&mut self.as_mut()[..buf.len()], buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
// SAFETY: We just added the entire contents of buf to the filled section.
|
// SAFETY: We just added the entire contents of buf to the filled section.
|
||||||
|
@ -1016,7 +1016,7 @@ impl<T> MaybeUninit<T> {
|
|||||||
|
|
||||||
/// Copies the elements from `src` to `this`, returning a mutable reference to the now initialized contents of `this`.
|
/// Copies the elements from `src` to `this`, returning a mutable reference to the now initialized contents of `this`.
|
||||||
///
|
///
|
||||||
/// If `T` does not implement `Copy`, use [`write_slice_cloned`]
|
/// If `T` does not implement `Copy`, use [`clone_from_slice`]
|
||||||
///
|
///
|
||||||
/// This is similar to [`slice::copy_from_slice`].
|
/// This is similar to [`slice::copy_from_slice`].
|
||||||
///
|
///
|
||||||
@ -1033,7 +1033,7 @@ impl<T> MaybeUninit<T> {
|
|||||||
/// let mut dst = [MaybeUninit::uninit(); 32];
|
/// let mut dst = [MaybeUninit::uninit(); 32];
|
||||||
/// let src = [0; 32];
|
/// let src = [0; 32];
|
||||||
///
|
///
|
||||||
/// let init = MaybeUninit::write_slice(&mut dst, &src);
|
/// let init = MaybeUninit::copy_from_slice(&mut dst, &src);
|
||||||
///
|
///
|
||||||
/// assert_eq!(init, src);
|
/// assert_eq!(init, src);
|
||||||
/// ```
|
/// ```
|
||||||
@ -1045,7 +1045,7 @@ impl<T> MaybeUninit<T> {
|
|||||||
/// let mut vec = Vec::with_capacity(32);
|
/// let mut vec = Vec::with_capacity(32);
|
||||||
/// let src = [0; 16];
|
/// let src = [0; 16];
|
||||||
///
|
///
|
||||||
/// MaybeUninit::write_slice(&mut vec.spare_capacity_mut()[..src.len()], &src);
|
/// MaybeUninit::copy_from_slice(&mut vec.spare_capacity_mut()[..src.len()], &src);
|
||||||
///
|
///
|
||||||
/// // SAFETY: we have just copied all the elements of len into the spare capacity
|
/// // SAFETY: we have just copied all the elements of len into the spare capacity
|
||||||
/// // the first src.len() elements of the vec are valid now.
|
/// // the first src.len() elements of the vec are valid now.
|
||||||
@ -1056,9 +1056,9 @@ impl<T> MaybeUninit<T> {
|
|||||||
/// assert_eq!(vec, src);
|
/// assert_eq!(vec, src);
|
||||||
/// ```
|
/// ```
|
||||||
///
|
///
|
||||||
/// [`write_slice_cloned`]: MaybeUninit::write_slice_cloned
|
/// [`clone_from_slice`]: MaybeUninit::clone_from_slice
|
||||||
#[unstable(feature = "maybe_uninit_write_slice", issue = "79995")]
|
#[unstable(feature = "maybe_uninit_write_slice", issue = "79995")]
|
||||||
pub fn write_slice<'a>(this: &'a mut [MaybeUninit<T>], src: &[T]) -> &'a mut [T]
|
pub fn copy_from_slice<'a>(this: &'a mut [MaybeUninit<T>], src: &[T]) -> &'a mut [T]
|
||||||
where
|
where
|
||||||
T: Copy,
|
T: Copy,
|
||||||
{
|
{
|
||||||
@ -1074,7 +1074,7 @@ impl<T> MaybeUninit<T> {
|
|||||||
/// Clones the elements from `src` to `this`, returning a mutable reference to the now initialized contents of `this`.
|
/// Clones the elements from `src` to `this`, returning a mutable reference to the now initialized contents of `this`.
|
||||||
/// Any already initialized elements will not be dropped.
|
/// Any already initialized elements will not be dropped.
|
||||||
///
|
///
|
||||||
/// If `T` implements `Copy`, use [`write_slice`]
|
/// If `T` implements `Copy`, use [`copy_from_slice`]
|
||||||
///
|
///
|
||||||
/// This is similar to [`slice::clone_from_slice`] but does not drop existing elements.
|
/// This is similar to [`slice::clone_from_slice`] but does not drop existing elements.
|
||||||
///
|
///
|
||||||
@ -1093,7 +1093,7 @@ impl<T> MaybeUninit<T> {
|
|||||||
/// let mut dst = [MaybeUninit::uninit(), MaybeUninit::uninit(), MaybeUninit::uninit(), MaybeUninit::uninit(), MaybeUninit::uninit()];
|
/// let mut dst = [MaybeUninit::uninit(), MaybeUninit::uninit(), MaybeUninit::uninit(), MaybeUninit::uninit(), MaybeUninit::uninit()];
|
||||||
/// let src = ["wibbly".to_string(), "wobbly".to_string(), "timey".to_string(), "wimey".to_string(), "stuff".to_string()];
|
/// let src = ["wibbly".to_string(), "wobbly".to_string(), "timey".to_string(), "wimey".to_string(), "stuff".to_string()];
|
||||||
///
|
///
|
||||||
/// let init = MaybeUninit::write_slice_cloned(&mut dst, &src);
|
/// let init = MaybeUninit::clone_from_slice(&mut dst, &src);
|
||||||
///
|
///
|
||||||
/// assert_eq!(init, src);
|
/// assert_eq!(init, src);
|
||||||
/// ```
|
/// ```
|
||||||
@ -1105,7 +1105,7 @@ impl<T> MaybeUninit<T> {
|
|||||||
/// let mut vec = Vec::with_capacity(32);
|
/// let mut vec = Vec::with_capacity(32);
|
||||||
/// let src = ["rust", "is", "a", "pretty", "cool", "language"];
|
/// let src = ["rust", "is", "a", "pretty", "cool", "language"];
|
||||||
///
|
///
|
||||||
/// MaybeUninit::write_slice_cloned(&mut vec.spare_capacity_mut()[..src.len()], &src);
|
/// MaybeUninit::clone_from_slice(&mut vec.spare_capacity_mut()[..src.len()], &src);
|
||||||
///
|
///
|
||||||
/// // SAFETY: we have just cloned all the elements of len into the spare capacity
|
/// // SAFETY: we have just cloned all the elements of len into the spare capacity
|
||||||
/// // the first src.len() elements of the vec are valid now.
|
/// // the first src.len() elements of the vec are valid now.
|
||||||
@ -1116,9 +1116,9 @@ impl<T> MaybeUninit<T> {
|
|||||||
/// assert_eq!(vec, src);
|
/// assert_eq!(vec, src);
|
||||||
/// ```
|
/// ```
|
||||||
///
|
///
|
||||||
/// [`write_slice`]: MaybeUninit::write_slice
|
/// [`copy_from_slice`]: MaybeUninit::copy_from_slice
|
||||||
#[unstable(feature = "maybe_uninit_write_slice", issue = "79995")]
|
#[unstable(feature = "maybe_uninit_write_slice", issue = "79995")]
|
||||||
pub fn write_slice_cloned<'a>(this: &'a mut [MaybeUninit<T>], src: &[T]) -> &'a mut [T]
|
pub fn clone_from_slice<'a>(this: &'a mut [MaybeUninit<T>], src: &[T]) -> &'a mut [T]
|
||||||
where
|
where
|
||||||
T: Clone,
|
T: Clone,
|
||||||
{
|
{
|
||||||
@ -1261,7 +1261,7 @@ impl<T> MaybeUninit<T> {
|
|||||||
///
|
///
|
||||||
/// let mut uninit = [MaybeUninit::<u16>::uninit(), MaybeUninit::<u16>::uninit()];
|
/// let mut uninit = [MaybeUninit::<u16>::uninit(), MaybeUninit::<u16>::uninit()];
|
||||||
/// let uninit_bytes = MaybeUninit::slice_as_bytes_mut(&mut uninit);
|
/// let uninit_bytes = MaybeUninit::slice_as_bytes_mut(&mut uninit);
|
||||||
/// MaybeUninit::write_slice(uninit_bytes, &[0x12, 0x34, 0x56, 0x78]);
|
/// MaybeUninit::copy_from_slice(uninit_bytes, &[0x12, 0x34, 0x56, 0x78]);
|
||||||
/// let vals = unsafe { MaybeUninit::slice_assume_init_ref(&uninit) };
|
/// let vals = unsafe { MaybeUninit::slice_assume_init_ref(&uninit) };
|
||||||
/// if cfg!(target_endian = "little") {
|
/// if cfg!(target_endian = "little") {
|
||||||
/// assert_eq!(vals, &[0x3412u16, 0x7856u16]);
|
/// assert_eq!(vals, &[0x3412u16, 0x7856u16]);
|
||||||
|
@ -30,7 +30,7 @@ impl<const SIZE: usize> fmt::Write for DisplayBuffer<SIZE> {
|
|||||||
let bytes = s.as_bytes();
|
let bytes = s.as_bytes();
|
||||||
|
|
||||||
if let Some(buf) = self.buf.get_mut(self.len..(self.len + bytes.len())) {
|
if let Some(buf) = self.buf.get_mut(self.len..(self.len + bytes.len())) {
|
||||||
MaybeUninit::write_slice(buf, bytes);
|
MaybeUninit::copy_from_slice(buf, bytes);
|
||||||
self.len += bytes.len();
|
self.len += bytes.len();
|
||||||
Ok(())
|
Ok(())
|
||||||
} else {
|
} else {
|
||||||
|
@ -205,7 +205,7 @@ fn uninit_write_slice() {
|
|||||||
let mut dst = [MaybeUninit::new(255); 64];
|
let mut dst = [MaybeUninit::new(255); 64];
|
||||||
let src = [0; 64];
|
let src = [0; 64];
|
||||||
|
|
||||||
assert_eq!(MaybeUninit::write_slice(&mut dst, &src), &src);
|
assert_eq!(MaybeUninit::copy_from_slice(&mut dst, &src), &src);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@ -214,7 +214,7 @@ fn uninit_write_slice_panic_lt() {
|
|||||||
let mut dst = [MaybeUninit::uninit(); 64];
|
let mut dst = [MaybeUninit::uninit(); 64];
|
||||||
let src = [0; 32];
|
let src = [0; 32];
|
||||||
|
|
||||||
MaybeUninit::write_slice(&mut dst, &src);
|
MaybeUninit::copy_from_slice(&mut dst, &src);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@ -223,7 +223,7 @@ fn uninit_write_slice_panic_gt() {
|
|||||||
let mut dst = [MaybeUninit::uninit(); 64];
|
let mut dst = [MaybeUninit::uninit(); 64];
|
||||||
let src = [0; 128];
|
let src = [0; 128];
|
||||||
|
|
||||||
MaybeUninit::write_slice(&mut dst, &src);
|
MaybeUninit::copy_from_slice(&mut dst, &src);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@ -231,7 +231,7 @@ fn uninit_clone_from_slice() {
|
|||||||
let mut dst = [MaybeUninit::new(255); 64];
|
let mut dst = [MaybeUninit::new(255); 64];
|
||||||
let src = [0; 64];
|
let src = [0; 64];
|
||||||
|
|
||||||
assert_eq!(MaybeUninit::write_slice_cloned(&mut dst, &src), &src);
|
assert_eq!(MaybeUninit::clone_from_slice(&mut dst, &src), &src);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@ -240,7 +240,7 @@ fn uninit_write_slice_cloned_panic_lt() {
|
|||||||
let mut dst = [MaybeUninit::uninit(); 64];
|
let mut dst = [MaybeUninit::uninit(); 64];
|
||||||
let src = [0; 32];
|
let src = [0; 32];
|
||||||
|
|
||||||
MaybeUninit::write_slice_cloned(&mut dst, &src);
|
MaybeUninit::clone_from_slice(&mut dst, &src);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@ -249,7 +249,7 @@ fn uninit_write_slice_cloned_panic_gt() {
|
|||||||
let mut dst = [MaybeUninit::uninit(); 64];
|
let mut dst = [MaybeUninit::uninit(); 64];
|
||||||
let src = [0; 128];
|
let src = [0; 128];
|
||||||
|
|
||||||
MaybeUninit::write_slice_cloned(&mut dst, &src);
|
MaybeUninit::clone_from_slice(&mut dst, &src);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@ -290,7 +290,7 @@ fn uninit_write_slice_cloned_mid_panic() {
|
|||||||
];
|
];
|
||||||
|
|
||||||
let err = panic::catch_unwind(panic::AssertUnwindSafe(|| {
|
let err = panic::catch_unwind(panic::AssertUnwindSafe(|| {
|
||||||
MaybeUninit::write_slice_cloned(&mut dst, &src);
|
MaybeUninit::clone_from_slice(&mut dst, &src);
|
||||||
}));
|
}));
|
||||||
|
|
||||||
drop(src);
|
drop(src);
|
||||||
@ -322,7 +322,7 @@ fn uninit_write_slice_cloned_no_drop() {
|
|||||||
let mut dst = [MaybeUninit::uninit()];
|
let mut dst = [MaybeUninit::uninit()];
|
||||||
let src = [Bomb];
|
let src = [Bomb];
|
||||||
|
|
||||||
MaybeUninit::write_slice_cloned(&mut dst, &src);
|
MaybeUninit::clone_from_slice(&mut dst, &src);
|
||||||
|
|
||||||
forget(src);
|
forget(src);
|
||||||
}
|
}
|
||||||
|
@ -105,7 +105,7 @@ impl Arena {
|
|||||||
#[allow(clippy::mut_from_ref)] // arena allocator
|
#[allow(clippy::mut_from_ref)] // arena allocator
|
||||||
pub(crate) fn alloc_str<'a>(&'a self, string: &str) -> &'a mut str {
|
pub(crate) fn alloc_str<'a>(&'a self, string: &str) -> &'a mut str {
|
||||||
let alloc = self.alloc_raw(string.len());
|
let alloc = self.alloc_raw(string.len());
|
||||||
let bytes = MaybeUninit::write_slice(alloc, string.as_bytes());
|
let bytes = MaybeUninit::copy_from_slice(alloc, string.as_bytes());
|
||||||
|
|
||||||
// SAFETY: we convert from `&str` to `&[u8]`, clone it into the arena,
|
// SAFETY: we convert from `&str` to `&[u8]`, clone it into the arena,
|
||||||
// and immediately convert the clone back to `&str`.
|
// and immediately convert the clone back to `&str`.
|
||||||
|
Loading…
Reference in New Issue
Block a user