Actually deprecate heap modules.

2 files changed, 9 insertions, 3 deletions

diff --git a/src/liballoc/alloc.rs b/src/liballoc/alloc.rs
index 000c0123d9f..2477166966e 100644
--- a/src/liballoc/alloc.rs
+++ b/src/liballoc/alloc.rs
@@ -20,7 +20,7 @@ use core::mem::{self, ManuallyDrop};
 use core::usize;
 
 #[doc(inline)]
-pub use core::heap::*;
+pub use core::alloc::*;
 
 #[doc(hidden)]
 pub mod __core {
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs
index 617bc5c52b3..066698a71df 100644
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -141,7 +141,10 @@ mod macros;
 
 #[rustc_deprecated(since = "1.27.0", reason = "use the heap module in core, alloc, or std instead")]
 #[unstable(feature = "allocator_api", issue = "32838")]
-pub use core::heap as allocator;
+/// Use the `alloc` module instead.
+pub mod allocator {
+    pub use alloc::*;
+}
 
 // Heaps provided for low-level allocation strategies
 
@@ -149,7 +152,10 @@ pub mod alloc;
 
 #[unstable(feature = "allocator_api", issue = "32838")]
 #[rustc_deprecated(since = "1.27.0", reason = "module renamed to `alloc`")]
-pub use alloc as heap;
+/// Use the `alloc` module instead.
+pub mod heap {
+    pub use alloc::*;
+}
 
 // Primitive types using the heaps above