diff options
| author | Ralf Jung <post@ralfj.de> | 2018-10-10 12:04:07 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2018-11-23 22:50:20 +0100 |
| commit | 5e27ee76b652dc7fbe5da1d213580c9ada0d65e1 (patch) | |
| tree | e1c812348f80a9492a0c5cc1b98fadb784f9a60c /src/libcore | |
| parent | 3fb03d0650825ba254f67fdd5ac94e83e2622415 (diff) | |
| download | rust-5e27ee76b652dc7fbe5da1d213580c9ada0d65e1.tar.gz rust-5e27ee76b652dc7fbe5da1d213580c9ada0d65e1.zip | |
use MaybeUninit in core::ptr::swap_nonoverlapping_bytes
Code by @japaric, I just split it into individual commits
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/ptr.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs index 5032c112f7c..947b67e4e9a 100644 --- a/src/libcore/ptr.rs +++ b/src/libcore/ptr.rs @@ -389,8 +389,8 @@ unsafe fn swap_nonoverlapping_bytes(x: *mut u8, y: *mut u8, len: usize) { while i + block_size <= len { // Create some uninitialized memory as scratch space // Declaring `t` here avoids aligning the stack when this loop is unused - let mut t: Block = mem::uninitialized(); - let t = &mut t as *mut _ as *mut u8; + let mut t = mem::MaybeUninit::<Block>::uninitialized(); + let t = t.as_mut_ptr() as *mut u8; let x = x.add(i); let y = y.add(i); @@ -404,10 +404,10 @@ unsafe fn swap_nonoverlapping_bytes(x: *mut u8, y: *mut u8, len: usize) { if i < len { // Swap any remaining bytes - let mut t: UnalignedBlock = mem::uninitialized(); + let mut t = mem::MaybeUninit::<UnalignedBlock>::uninitialized(); let rem = len - i; - let t = &mut t as *mut _ as *mut u8; + let t = t.as_mut_ptr() as *mut u8; let x = x.add(i); let y = y.add(i); |
