diff options
| author | bors <bors@rust-lang.org> | 2018-05-17 16:44:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-05-17 16:44:38 +0000 |
| commit | 90463a6bdcd18c60e18a1cc810fc6453b96f7d54 (patch) | |
| tree | 73a99c27209c97d623333dabb38158550c0cd6c0 /src/liballoc_system | |
| parent | dbd10f81758381339f98994b8d31814cf5e98707 (diff) | |
| parent | a22af69c8f5b3838a8822b9e6dbe2199cfb8f297 (diff) | |
| download | rust-90463a6bdcd18c60e18a1cc810fc6453b96f7d54.tar.gz rust-90463a6bdcd18c60e18a1cc810fc6453b96f7d54.zip | |
Auto merge of #50629 - Mark-Simulacrum:stage-step, r=alexcrichton
Switch to bootstrapping from 1.27 It's possible the Float trait could be removed from core, but I couldn't tell whether it was intended to be removed or not. @SimonSapin may be able to comment more here; we can presumably also do that in a follow up PR as this one is already quite large.
Diffstat (limited to 'src/liballoc_system')
| -rw-r--r-- | src/liballoc_system/lib.rs | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/src/liballoc_system/lib.rs b/src/liballoc_system/lib.rs index 7376ac0f15d..9490b54e675 100644 --- a/src/liballoc_system/lib.rs +++ b/src/liballoc_system/lib.rs @@ -73,33 +73,6 @@ unsafe impl Alloc for System { } } -#[cfg(stage0)] -#[unstable(feature = "allocator_api", issue = "32838")] -unsafe impl<'a> Alloc for &'a System { - #[inline] - unsafe fn alloc(&mut self, layout: Layout) -> Result<NonNull<Opaque>, AllocErr> { - NonNull::new(GlobalAlloc::alloc(*self, layout)).ok_or(AllocErr) - } - - #[inline] - unsafe fn alloc_zeroed(&mut self, layout: Layout) -> Result<NonNull<Opaque>, AllocErr> { - NonNull::new(GlobalAlloc::alloc_zeroed(*self, layout)).ok_or(AllocErr) - } - - #[inline] - unsafe fn dealloc(&mut self, ptr: NonNull<Opaque>, layout: Layout) { - GlobalAlloc::dealloc(*self, ptr.as_ptr(), layout) - } - - #[inline] - unsafe fn realloc(&mut self, - ptr: NonNull<Opaque>, - layout: Layout, - new_size: usize) -> Result<NonNull<Opaque>, AllocErr> { - NonNull::new(GlobalAlloc::realloc(*self, ptr.as_ptr(), layout, new_size)).ok_or(AllocErr) - } -} - #[cfg(any(windows, unix, target_os = "cloudabi", target_os = "redox"))] mod realloc_fallback { use core::alloc::{GlobalAlloc, Opaque, Layout}; |
