From 1c02e6c368337bea10a57eb345bd36edbff75f87 Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Thu, 12 Mar 2020 21:04:00 +0100 Subject: Rustup to rustc 1.43.0-nightly (c20d7eecb 2020-03-11) --- build_sysroot/alloc_system/lib.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'build_sysroot') diff --git a/build_sysroot/alloc_system/lib.rs b/build_sysroot/alloc_system/lib.rs index abfcf301a53..8ad0a076d3d 100644 --- a/build_sysroot/alloc_system/lib.rs +++ b/build_sysroot/alloc_system/lib.rs @@ -72,14 +72,16 @@ pub struct System; #[unstable(feature = "allocator_api", issue = "32838")] unsafe impl AllocRef for System { #[inline] - unsafe fn alloc(&mut self, layout: Layout) -> Result<(NonNull, usize), AllocErr> { - NonNull::new(GlobalAlloc::alloc(self, layout)).ok_or(AllocErr).map(|p| (p, layout.size())) + fn alloc(&mut self, layout: Layout) -> Result<(NonNull, usize), AllocErr> { + NonNull::new(unsafe { GlobalAlloc::alloc(self, layout) }) + .ok_or(AllocErr) + .map(|p| (p, layout.size())) } #[inline] - unsafe fn alloc_zeroed(&mut self, layout: Layout) -> Result<(NonNull, usize), AllocErr> { - NonNull::new(GlobalAlloc::alloc_zeroed(self, layout)) - .ok_or(AllocErr) - .map(|p| (p, layout.size())) + fn alloc_zeroed(&mut self, layout: Layout) -> Result<(NonNull, usize), AllocErr> { + NonNull::new(unsafe { GlobalAlloc::alloc_zeroed(self, layout) }) + .ok_or(AllocErr) + .map(|p| (p, layout.size())) } #[inline] unsafe fn dealloc(&mut self, ptr: NonNull, layout: Layout) { -- cgit 1.4.1-3-g733a5