diff options
| author | bors <bors@rust-lang.org> | 2018-06-12 00:36:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-06-12 00:36:21 +0000 |
| commit | 4367e41ea2a105c373de27c2f080fc2527cc6927 (patch) | |
| tree | 9ca30ec2dbf3311f0a0d0d6275d5abca8f23fc1f /src/liballoc/lib.rs | |
| parent | f9944fde377b8b2575f96fff60f784eddce54002 (diff) | |
| parent | 7f0d54d98842c786ab7a140c17c3ea32aea6aead (diff) | |
| download | rust-4367e41ea2a105c373de27c2f080fc2527cc6927.tar.gz rust-4367e41ea2a105c373de27c2f080fc2527cc6927.zip | |
Auto merge of #51241 - glandium:globalalloc, r=sfackler,SimonSapin
Stabilize GlobalAlloc and #[global_allocator] This PR implements the changes discussed in https://github.com/rust-lang/rust/issues/49668#issuecomment-393263510 Fixes #49668 Fixes #27389 This does not change the default global allocator: #36963
Diffstat (limited to 'src/liballoc/lib.rs')
| -rw-r--r-- | src/liballoc/lib.rs | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index a1139189c9a..74bbd659246 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -151,18 +151,10 @@ pub mod allocator { pub mod alloc; -#[unstable(feature = "allocator_api", issue = "32838")] -#[rustc_deprecated(since = "1.27.0", reason = "module renamed to `alloc`")] -/// Use the `alloc` module instead. -pub mod heap { - pub use alloc::*; -} - #[unstable(feature = "futures_api", reason = "futures in libcore are unstable", issue = "50547")] pub mod task; - // Primitive types using the heaps above // Need to conditionally define the mod from `boxed.rs` to avoid |