diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2018-05-30 21:15:40 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2018-06-11 13:47:28 -0700 |
| commit | 11f992c9584f05f56664627ac1ec42e4cd1f0e3e (patch) | |
| tree | a1da71efd729aa1a9c93ef30330c01df19a552fc | |
| parent | 8c30c5168694b8ee740dade3a0145eef8aba66c6 (diff) | |
| download | rust-11f992c9584f05f56664627ac1ec42e4cd1f0e3e.tar.gz rust-11f992c9584f05f56664627ac1ec42e4cd1f0e3e.zip | |
Remove the deprecated Heap type/const
| -rw-r--r-- | src/liballoc/alloc.rs | 9 | ||||
| -rw-r--r-- | src/libstd/alloc.rs | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/liballoc/alloc.rs b/src/liballoc/alloc.rs index 8c2dda77226..710da9a475b 100644 --- a/src/liballoc/alloc.rs +++ b/src/liballoc/alloc.rs @@ -41,15 +41,6 @@ extern "Rust" { pub struct Global; #[unstable(feature = "allocator_api", issue = "32838")] -#[rustc_deprecated(since = "1.27.0", reason = "type renamed to `Global`")] -pub type Heap = Global; - -#[unstable(feature = "allocator_api", issue = "32838")] -#[rustc_deprecated(since = "1.27.0", reason = "type renamed to `Global`")] -#[allow(non_upper_case_globals)] -pub const Heap: Global = Global; - -#[unstable(feature = "allocator_api", issue = "32838")] #[inline] pub unsafe fn alloc(layout: Layout) -> *mut u8 { __rust_alloc(layout.size(), layout.align()) diff --git a/src/libstd/alloc.rs b/src/libstd/alloc.rs index 3f31fa8e1dd..9904634f1fa 100644 --- a/src/libstd/alloc.rs +++ b/src/libstd/alloc.rs @@ -12,7 +12,6 @@ #![unstable(issue = "32838", feature = "allocator_api")] -#[doc(inline)] #[allow(deprecated)] pub use alloc_crate::alloc::Heap; #[doc(inline)] pub use alloc_crate::alloc::{Global, Layout, oom}; #[doc(inline)] pub use alloc_crate::alloc::{alloc, alloc_zeroed, dealloc, realloc}; #[doc(inline)] pub use alloc_system::System; |