diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2018-03-28 22:37:37 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2018-03-29 14:58:07 +0200 |
| commit | 94d1970bba87f2d2893f6e934e4c3f02ed50604d (patch) | |
| tree | 05bdffecb111abc4dbc2b3d888f87b225277159b /src/liballoc/lib.rs | |
| parent | 1169541e173965531de77c15316e83962a7ae39b (diff) | |
| download | rust-94d1970bba87f2d2893f6e934e4c3f02ed50604d.tar.gz rust-94d1970bba87f2d2893f6e934e4c3f02ed50604d.zip | |
Move the alloc::allocator module to core::heap
This is the `Alloc` trait and its dependencies.
Diffstat (limited to 'src/liballoc/lib.rs')
| -rw-r--r-- | src/liballoc/lib.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index 19d64d8fea9..5594caa65b9 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -81,6 +81,7 @@ #![cfg_attr(not(test), feature(exact_size_is_empty))] #![cfg_attr(not(test), feature(generator_trait))] #![cfg_attr(test, feature(rand, test))] +#![feature(allocator_api)] #![feature(allow_internal_unstable)] #![feature(ascii_ctype)] #![feature(box_into_raw_non_null)] @@ -145,9 +146,9 @@ extern crate std_unicode; #[macro_use] mod macros; -// Allocator trait and helper struct definitions - -pub mod allocator; +#[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; // Heaps provided for low-level allocation strategies |