about summary refs log tree commit diff
path: root/src/liballoc/heap.rs
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2018-03-28 22:37:37 +0200
committerSimon Sapin <simon.sapin@exyr.org>2018-03-29 14:58:07 +0200
commit94d1970bba87f2d2893f6e934e4c3f02ed50604d (patch)
tree05bdffecb111abc4dbc2b3d888f87b225277159b /src/liballoc/heap.rs
parent1169541e173965531de77c15316e83962a7ae39b (diff)
Move the alloc::allocator module to core::heap
This is the `Alloc` trait and its dependencies.
Diffstat (limited to 'src/liballoc/heap.rs')
-rw-r--r--src/liballoc/heap.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/heap.rs b/src/liballoc/heap.rs
index c13ad39e5e1..9296a113071 100644
--- a/src/liballoc/heap.rs
+++ b/src/liballoc/heap.rs
@@ -19,7 +19,7 @@ use core::intrinsics::{min_align_of_val, size_of_val};
 use core::mem::{self, ManuallyDrop};
 use core::usize;
 
-pub use allocator::*;
+pub use core::heap::*;
 #[doc(hidden)]
 pub mod __core {
     pub use core::*;