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

Use reference instead of raw pointer

Browse Source
This commit is contained in:
Caio 2021-09-30 08:40:05 -03:00
parent 4be574e6c9
commit fdccc7dad9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/core/src/array/mod.rs
View File

@ -559,16 +559,17 @@ where
return unsafe { Some(Ok(mem::zeroed())) }; return unsafe { Some(Ok(mem::zeroed())) };
} }
struct Guard<T, const N: usize> { struct Guard<'a, T, const N: usize> {
ptr: *mut T, array_mut: &'a mut [MaybeUninit<T>; N],
initialized: usize, initialized: usize,
} }
impl<T, const N: usize> Drop for Guard<T, N> { impl<T, const N: usize> Drop for Guard<'_, T, N> {
fn drop(&mut self) { fn drop(&mut self) {
debug_assert!(self.initialized <= N); debug_assert!(self.initialized <= N);
let initialized_part = crate::ptr::slice_from_raw_parts_mut(self.ptr, self.initialized); let ptr = MaybeUninit::slice_as_mut_ptr(self.array_mut);
let initialized_part = crate::ptr::slice_from_raw_parts_mut(ptr, self.initialized);
// SAFETY: this raw slice will contain only initialized objects. // SAFETY: this raw slice will contain only initialized objects.
unsafe { unsafe {
@ -578,8 +579,7 @@ where
} }
let mut array = MaybeUninit::uninit_array::<N>(); let mut array = MaybeUninit::uninit_array::<N>();
let mut guard: Guard<_, N> = let mut guard: Guard<'_, _, N> = Guard { array_mut: &mut array, initialized: 0 };
Guard { ptr: MaybeUninit::slice_as_mut_ptr(&mut array), initialized: 0 };
while let Some(item_rslt) = iter.next() { while let Some(item_rslt) = iter.next() {
let item = match item_rslt { let item = match item_rslt {
@ -593,7 +593,7 @@ where
// loop and the loop is aborted once it reaches N (which is // loop and the loop is aborted once it reaches N (which is
// `array.len()`). // `array.len()`).
unsafe { unsafe {
array.get_unchecked_mut(guard.initialized).write(item); guard.array_mut.get_unchecked_mut(guard.initialized).write(item);
} }
guard.initialized += 1; guard.initialized += 1;