From 09e8db1e4f33ec82316e1eeaaedad94fe6e1acb5 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Tue, 3 Apr 2018 14:41:15 +0200
Subject: [PATCH] Rename `heap` modules in the core, alloc, and std crates to
 `alloc`

---
 src/liballoc/{heap.rs => alloc.rs} | 0
 src/liballoc/lib.rs                | 8 ++++++--
 src/libcore/{heap.rs => alloc.rs}  | 0
 src/libcore/lib.rs                 | 6 +++++-
 src/libstd/{heap.rs => alloc.rs}   | 0
 src/libstd/lib.rs                  | 6 +++++-
 6 files changed, 16 insertions(+), 4 deletions(-)
 rename src/liballoc/{heap.rs => alloc.rs} (100%)
 rename src/libcore/{heap.rs => alloc.rs} (100%)
 rename src/libstd/{heap.rs => alloc.rs} (100%)

diff --git a/src/liballoc/heap.rs b/src/liballoc/alloc.rs
similarity index 100%
rename from src/liballoc/heap.rs
rename to src/liballoc/alloc.rs
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs
index 5ca39442342..617bc5c52b3 100644
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -57,7 +57,7 @@
 //!
 //! ## Heap interfaces
 //!
-//! The [`heap`](heap/index.html) module defines the low-level interface to the
+//! The [`alloc`](alloc/index.html) module defines the low-level interface to the
 //! default global allocator. It is not compatible with the libc allocator API.
 
 #![allow(unused_attributes)]
@@ -145,7 +145,11 @@ pub use core::heap as allocator;
 
 // Heaps provided for low-level allocation strategies
 
-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;
 
 // Primitive types using the heaps above
 
diff --git a/src/libcore/heap.rs b/src/libcore/alloc.rs
similarity index 100%
rename from src/libcore/heap.rs
rename to src/libcore/alloc.rs
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;
diff --git a/src/libstd/heap.rs b/src/libstd/alloc.rs
similarity index 100%
rename from src/libstd/heap.rs
rename to src/libstd/alloc.rs
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index ef4205e7a62..3a99e845a16 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -477,7 +477,11 @@ pub mod path;
 pub mod process;
 pub mod sync;
 pub mod time;
-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;
 
 // Platform-abstraction modules
 #[macro_use]