Actually deprecate heap modules.

diff --git a/src/liballoc/alloc.rs b/src/liballoc/alloc.rs
index 000c0123d9fede384fcb95daea2a4366ad62c550..2477166966e79d612dfbae1ecb390cfc671c45a3 100644 (file)
--- a/src/liballoc/alloc.rs
+++ b/src/liballoc/alloc.rs
@@ -20,7 +20,7 @@
 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 617bc5c52b3a8470c82a546aa8fe4efa5474ad57..066698a71df21f1f21f17b3c1dd3e5db47d69745 100644 (file)
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -141,7 +141,10 @@
 
 #[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 @@
 
 #[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
 

diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
index 56d4e65d3ac4254a94a1f444743ce070db66efa2..5ebd9e4334cd8ad000371ec0f857b4d3d55161e5 100644 (file)
--- a/src/libcore/lib.rs
+++ b/src/libcore/lib.rs
@@ -189,7 +189,10 @@
 
 #[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;

diff --git a/src/libstd/alloc.rs b/src/libstd/alloc.rs
index b42a1052c49f73d24cdfbb150600b2c1ace3720a..77be3e52d76477a245ad1caa33d569e34f7b160c 100644 (file)
--- a/src/libstd/alloc.rs
+++ b/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)]

diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 3a99e845a16057cfa28c0a512f4477176df8ec37..25ba75fd35eb8b8a5eb00867141b8c2aac20576b 100644 (file)
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -481,7 +481,10 @@
 
 #[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]