diff --git a/library/alloc/src/boehm.rs b/library/alloc/src/boehm.rs index 67127d330047c..1f72b4fb7cc58 100644 --- a/library/alloc/src/boehm.rs +++ b/library/alloc/src/boehm.rs @@ -13,15 +13,15 @@ pub(crate) struct BoehmGcAllocator; #[unstable(feature = "allocator_api", issue = "32838")] unsafe impl GlobalAlloc for BoehmAllocator { unsafe fn alloc(&self, layout: Layout) -> *mut u8 { - GC_malloc_uncollectable(layout.size()) as *mut u8 + unsafe { GC_malloc_uncollectable(layout.size()) as *mut u8 } } unsafe fn dealloc(&self, ptr: *mut u8, _: Layout) { - GC_free(ptr as *mut c_void); + unsafe { GC_free(ptr as *mut c_void) }; } unsafe fn realloc(&self, ptr: *mut u8, _: Layout, new_size: usize) -> *mut u8 { - GC_realloc(ptr as *mut c_void, new_size) as *mut u8 + unsafe { GC_realloc(ptr as *mut c_void, new_size) as *mut u8 } } } diff --git a/library/alloc/src/gc.rs b/library/alloc/src/gc.rs index 7f0f0ac20ca13..eab341f0a927c 100644 --- a/library/alloc/src/gc.rs +++ b/library/alloc/src/gc.rs @@ -99,7 +99,7 @@ impl Gc> { /// behaviour. pub unsafe fn assume_init(self) -> Gc { let ptr = self.ptr.as_ptr() as *mut GcBox>; - Gc::from_inner((&mut *ptr).assume_init()) + unsafe { Gc::from_inner((&mut *ptr).assume_init()) } } } @@ -139,7 +139,9 @@ impl GcBox { fn register_finalizer(&mut self) { unsafe extern "C" fn fshim(obj: *mut c_void, _meta: *mut c_void) { - ManuallyDrop::drop(&mut *(obj as *mut ManuallyDrop)); + unsafe { + ManuallyDrop::drop(&mut *(obj as *mut ManuallyDrop)); + } } unsafe { @@ -192,7 +194,7 @@ impl GcBox> { // is reclaimed, T will be dropped. We need to find its vptr and replace the // GcDummyDrop vptr in the block header with it. self.register_finalizer(); - NonNull::new_unchecked(self as *mut _ as *mut GcBox) + unsafe { NonNull::new_unchecked(self as *mut _ as *mut GcBox) } } }