bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove unsafe from TypedArena::alloc_raw_slice.

Browse source 
There's no good reason for it.
This commit is contained in:
Nicholas Nethercote 2023-09-20 07:36:19 +10:00
parent 55de23ed5d
commit 51edc21990
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_arena/src/lib.rs
View file

@ -172,8 +172,8 @@ impl<T, const N: usize> IterExt<T> for std::array::IntoIter<T, N> {
return &mut []; return &mut [];
} }
// Move the content to the arena by copying and then forgetting it. // Move the content to the arena by copying and then forgetting it.
let start_ptr = arena.alloc_raw_slice(len);
unsafe { unsafe {
let start_ptr = arena.alloc_raw_slice(len);
self.as_slice().as_ptr().copy_to_nonoverlapping(start_ptr, len); self.as_slice().as_ptr().copy_to_nonoverlapping(start_ptr, len);
mem::forget(self); mem::forget(self);
slice::from_raw_parts_mut(start_ptr, len) slice::from_raw_parts_mut(start_ptr, len)
@ -189,8 +189,8 @@ impl<T> IterExt<T> for Vec<T> {
return &mut []; return &mut [];
} }
// Move the content to the arena by copying and then forgetting it. // Move the content to the arena by copying and then forgetting it.
let start_ptr = arena.alloc_raw_slice(len);
unsafe { unsafe {
let start_ptr = arena.alloc_raw_slice(len);
self.as_ptr().copy_to_nonoverlapping(start_ptr, len); self.as_ptr().copy_to_nonoverlapping(start_ptr, len);
self.set_len(0); self.set_len(0);
slice::from_raw_parts_mut(start_ptr, len) slice::from_raw_parts_mut(start_ptr, len)
@ -206,8 +206,8 @@ impl<A: smallvec::Array> IterExt<A::Item> for SmallVec<A> {
return &mut []; return &mut [];
} }
// Move the content to the arena by copying and then forgetting it. // Move the content to the arena by copying and then forgetting it.
let start_ptr = arena.alloc_raw_slice(len);
unsafe { unsafe {
let start_ptr = arena.alloc_raw_slice(len);
self.as_ptr().copy_to_nonoverlapping(start_ptr, len); self.as_ptr().copy_to_nonoverlapping(start_ptr, len);
self.set_len(0); self.set_len(0);
slice::from_raw_parts_mut(start_ptr, len) slice::from_raw_parts_mut(start_ptr, len)
@ -251,7 +251,7 @@ impl<T> TypedArena<T> {
} }
#[inline] #[inline]
unsafe fn alloc_raw_slice(&self, len: usize) -> *mut T { fn alloc_raw_slice(&self, len: usize) -> *mut T {
assert!(mem::size_of::<T>() != 0); assert!(mem::size_of::<T>() != 0);
assert!(len != 0); assert!(len != 0);