Actually deprecate heap modules.

Author: SimonSapin

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 {

src/liballoc/lib.rs

@@ -141,15 +141,21 @@ 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
 
 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
 

src/libcore/lib.rs

@@ -189,7 +189,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::*;
+}
 
 // note: does not need to be public
 mod iter_private;

src/libstd/alloc.rs

@@ -12,9 +12,9 @@
 
 #![unstable(issue = "32838", feature = "allocator_api")]
 
-pub use alloc_crate::heap::Heap;
-pub use alloc_system::System;
-#[doc(inline)] pub use core::heap::*;
+#[doc(inline)] pub use alloc_crate::alloc::Heap;
+#[doc(inline)] pub use alloc_system::System;
+#[doc(inline)] pub use core::alloc::*;
 
 #[cfg(not(test))]
 #[doc(hidden)]

src/libstd/lib.rs

@@ -481,7 +481,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::*;
+}
 
 // Platform-abstraction modules
 #[macro_use]