diff options
| author | Aidan Hobson Sayers <aidanhs@cantab.net> | 2018-02-18 17:39:40 +0000 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2018-04-03 11:02:34 +0200 |
| commit | 9b5859aea199d5f34a4d4b5ae7112c5c41f3b242 (patch) | |
| tree | bc74fbacefd74d626e8c43968ab329c7621f4f70 /src/liballoc/lib.rs | |
| parent | 5ee891cfeabc0872624104611cc0a359f46447cc (diff) | |
| download | rust-9b5859aea199d5f34a4d4b5ae7112c5c41f3b242.tar.gz rust-9b5859aea199d5f34a4d4b5ae7112c5c41f3b242.zip | |
Remove all unstable placement features
Closes #22181, #27779
Diffstat (limited to 'src/liballoc/lib.rs')
| -rw-r--r-- | src/liballoc/lib.rs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index e6a311041f5..2fad3b0bad4 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -76,7 +76,6 @@ #![deny(missing_debug_implementations)] #![cfg_attr(test, allow(deprecated))] // rand -#![cfg_attr(test, feature(placement_in))] #![cfg_attr(not(test), feature(core_float))] #![cfg_attr(not(test), feature(exact_size_is_empty))] #![cfg_attr(not(test), feature(generator_trait))] @@ -108,8 +107,6 @@ #![feature(optin_builtin_traits)] #![feature(pattern)] #![feature(pin)] -#![feature(placement_in_syntax)] -#![feature(placement_new_protocol)] #![feature(ptr_internals)] #![feature(rustc_attrs)] #![feature(slice_get_slice)] @@ -128,8 +125,8 @@ #![feature(pointer_methods)] #![feature(inclusive_range_fields)] -#![cfg_attr(not(test), feature(fn_traits, placement_new_protocol, swap_with_slice, i128))] -#![cfg_attr(test, feature(test, box_heap))] +#![cfg_attr(not(test), feature(fn_traits, swap_with_slice, i128))] +#![cfg_attr(test, feature(test))] // Allow testing this library @@ -159,13 +156,12 @@ pub mod heap; // Need to conditionally define the mod from `boxed.rs` to avoid // duplicating the lang-items when building in test cfg; but also need -// to allow code to have `use boxed::HEAP;` -// and `use boxed::Box;` declarations. +// to allow code to have `use boxed::Box;` declarations. #[cfg(not(test))] pub mod boxed; #[cfg(test)] mod boxed { - pub use std::boxed::{Box, IntermediateBox, HEAP}; + pub use std::boxed::Box; } #[cfg(test)] mod boxed_test; |
