about summary refs log tree commit diff
path: root/src/libcore/lib.rs
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2018-04-03 14:41:15 +0200
committerSimon Sapin <simon.sapin@exyr.org>2018-04-12 22:52:47 +0200
commit09e8db1e4f33ec82316e1eeaaedad94fe6e1acb5 (patch)
tree0f69b9f8aa81b45c927d22d9db37f7ab7bc81050 /src/libcore/lib.rs
parent1b895d8b88413f72230fbc0f00c67328870a2e9a (diff)
downloadrust-09e8db1e4f33ec82316e1eeaaedad94fe6e1acb5.tar.gz
rust-09e8db1e4f33ec82316e1eeaaedad94fe6e1acb5.zip
Rename `heap` modules in the core, alloc, and std crates to `alloc`
Diffstat (limited to 'src/libcore/lib.rs')
-rw-r--r--src/libcore/lib.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
index 722a9de215c..56d4e65d3ac 100644
--- a/src/libcore/lib.rs
+++ b/src/libcore/lib.rs
@@ -185,7 +185,11 @@ pub mod unicode;
 
 /* Heap memory allocator trait */
 #[allow(missing_docs)]
-pub mod heap;
+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;
 
 // note: does not need to be public
 mod iter_private;