diff options
| author | bors <bors@rust-lang.org> | 2017-07-25 16:13:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-25 16:13:16 +0000 |
| commit | c417ee9ae8c30ac307c58591da46cf62e91caac1 (patch) | |
| tree | 8de4b9605fb1ef3b5ddb0ff1ff8277b6981b7f3a /src/liballoc | |
| parent | a643bdc681120446e3f5b787ae009bfa6b5f01b6 (diff) | |
| parent | 9010567dcc0aba772525841aee67c030ea3450c6 (diff) | |
| download | rust-c417ee9ae8c30ac307c58591da46cf62e91caac1.tar.gz rust-c417ee9ae8c30ac307c58591da46cf62e91caac1.zip | |
Auto merge of #43320 - alexcrichton:new-bootstrap, r=Mark-Simulacrum
Bump master to 1.21.0 This commit bumps the master branch's version to 1.21.0 and also updates the bootstrap compiler from the freshly minted beta release.
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/lib.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index 80532bbdda1..91653f87a30 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -85,7 +85,6 @@ #![cfg_attr(not(test), feature(slice_rotate))] #![cfg_attr(not(test), feature(str_checked_slicing))] #![cfg_attr(test, feature(rand, test))] -#![cfg_attr(stage0, feature(allocator))] #![feature(allow_internal_unstable)] #![feature(box_patterns)] #![feature(box_syntax)] @@ -124,7 +123,7 @@ #![feature(unicode)] #![feature(unique)] #![feature(unsize)] -#![cfg_attr(not(stage0), feature(allocator_internals))] +#![feature(allocator_internals)] #![cfg_attr(not(test), feature(fused, fn_traits, placement_new_protocol))] #![cfg_attr(test, feature(test, box_heap))] |