diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2018-03-28 22:37:37 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2018-03-29 14:58:07 +0200 |
| commit | 94d1970bba87f2d2893f6e934e4c3f02ed50604d (patch) | |
| tree | 05bdffecb111abc4dbc2b3d888f87b225277159b /src/libstd | |
| parent | 1169541e173965531de77c15316e83962a7ae39b (diff) | |
| download | rust-94d1970bba87f2d2893f6e934e4c3f02ed50604d.tar.gz rust-94d1970bba87f2d2893f6e934e4c3f02ed50604d.zip | |
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)] |