diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2020-03-04 15:04:28 +0100 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2020-03-04 15:04:28 +0100 |
| commit | 9ab2af56aa4a8b6f11a4275671fd7947c0251a0b (patch) | |
| tree | d82bdd0d9b951eec11095a167b481118005928cb /build_sysroot | |
| parent | dc1165300d7d63040904012d09a2556222c8aedd (diff) | |
| download | rust-9ab2af56aa4a8b6f11a4275671fd7947c0251a0b.tar.gz rust-9ab2af56aa4a8b6f11a4275671fd7947c0251a0b.zip | |
Rustup to rustc 1.43.0-nightly (4ad624882 2020-03-03)
Diffstat (limited to 'build_sysroot')
| -rw-r--r-- | build_sysroot/alloc_system/lib.rs | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/build_sysroot/alloc_system/lib.rs b/build_sysroot/alloc_system/lib.rs index c9815853de1..abfcf301a53 100644 --- a/build_sysroot/alloc_system/lib.rs +++ b/build_sysroot/alloc_system/lib.rs @@ -72,12 +72,14 @@ pub struct System; #[unstable(feature = "allocator_api", issue = "32838")] unsafe impl AllocRef for System { #[inline] - unsafe fn alloc(&mut self, layout: Layout) -> Result<NonNull<u8>, AllocErr> { - NonNull::new(GlobalAlloc::alloc(self, layout)).ok_or(AllocErr) + unsafe fn alloc(&mut self, layout: Layout) -> Result<(NonNull<u8>, usize), AllocErr> { + NonNull::new(GlobalAlloc::alloc(self, layout)).ok_or(AllocErr).map(|p| (p, layout.size())) } #[inline] - unsafe fn alloc_zeroed(&mut self, layout: Layout) -> Result<NonNull<u8>, AllocErr> { - NonNull::new(GlobalAlloc::alloc_zeroed(self, layout)).ok_or(AllocErr) + unsafe fn alloc_zeroed(&mut self, layout: Layout) -> Result<(NonNull<u8>, usize), AllocErr> { + NonNull::new(GlobalAlloc::alloc_zeroed(self, layout)) + .ok_or(AllocErr) + .map(|p| (p, layout.size())) } #[inline] unsafe fn dealloc(&mut self, ptr: NonNull<u8>, layout: Layout) { @@ -87,8 +89,10 @@ unsafe impl AllocRef for System { unsafe fn realloc(&mut self, ptr: NonNull<u8>, layout: Layout, - new_size: usize) -> Result<NonNull<u8>, AllocErr> { - NonNull::new(GlobalAlloc::realloc(self, ptr.as_ptr(), layout, new_size)).ok_or(AllocErr) + new_size: usize) -> Result<(NonNull<u8>, usize), AllocErr> { + NonNull::new(GlobalAlloc::realloc(self, ptr.as_ptr(), layout, new_size)) + .ok_or(AllocErr) + .map(|p| (p, layout.size())) } } #[cfg(any(windows, unix, target_os = "cloudabi", target_os = "redox"))] |