nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-10-30 22:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use *mut [T] instead of [MaybeUninit<T>]

Browse Source
This commit is contained in:
The 8472 2021-12-09 00:20:13 +01:00
parent 6851b8d931
commit 2d8a11bdbb
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/alloc/src/vec/drain.rs
View File

@ -1,7 +1,7 @@
use crate::alloc::{Allocator, Global};
use core::fmt;
use core::iter::{FusedIterator, TrustedLen};
use core::mem::{self, MaybeUninit};
use core::mem;
use core::ptr::{self, NonNull};
use core::slice::{self};
@ -160,12 +160,10 @@ impl<T, A: Allocator> Drop for Drain<'_, T, A> {
// a pointer with mutable provenance is necessary. Therefore we must reconstruct
// it from the original vec but also avoid creating a &mut to the front since that could
// invalidate raw pointers to it which some unsafe code might rely on.
let vec = vec.as_mut();
let spare_capacity = vec.spare_capacity_mut();
let drop_offset = drop_ptr.offset_from(spare_capacity.as_ptr() as *const _) as usize;
let drop_range = drop_offset..(drop_offset + drop_len);
let to_drop = &mut spare_capacity[drop_range];
ptr::drop_in_place(MaybeUninit::slice_assume_init_mut(to_drop));
let vec_ptr = vec.as_mut().as_mut_ptr();
let drop_offset = drop_ptr.offset_from(vec_ptr) as usize;
let to_drop = ptr::slice_from_raw_parts_mut(vec_ptr.add(drop_offset), drop_len);
ptr::drop_in_place(to_drop);
}
}
}