diff options
| author | bors <bors@rust-lang.org> | 2018-03-31 09:11:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-31 09:11:21 +0000 |
| commit | 8dd24c8ed4ac3e48068408fa21d491d7ffe45295 (patch) | |
| tree | 5ad91196b802bff59557df8ed2b24c3138b2e1fa /src/libstd | |
| parent | 085c4b43b567298aa7af21a92426f49633919047 (diff) | |
| parent | 94d1970bba87f2d2893f6e934e4c3f02ed50604d (diff) | |
| download | rust-8dd24c8ed4ac3e48068408fa21d491d7ffe45295.tar.gz rust-8dd24c8ed4ac3e48068408fa21d491d7ffe45295.zip | |
Auto merge of #49481 - SimonSapin:core-heap, r=alexcrichton
Move the alloc::allocator module to core::heap This is the `Alloc` trait and its dependencies.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/heap.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/heap.rs b/src/libstd/heap.rs index 4d5e4df6f95..4a391372c3a 100644 --- a/src/libstd/heap.rs +++ b/src/libstd/heap.rs @@ -12,8 +12,9 @@ #![unstable(issue = "32838", feature = "allocator_api")] -pub use alloc::heap::{Heap, Alloc, Layout, Excess, CannotReallocInPlace, AllocErr}; +pub use alloc::heap::Heap; pub use alloc_system::System; +pub use core::heap::*; #[cfg(not(test))] #[doc(hidden)] |