diff options
| author | bors <bors@rust-lang.org> | 2018-09-30 01:45:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-30 01:45:50 +0000 |
| commit | 6310be458f4665f537419f033a764b0644c7e5ab (patch) | |
| tree | 89427e9623f634be3528a30ca9441475d83b7e58 /src/liballoc | |
| parent | e0a1ab6374340a4b9ca9f0c6d387763cf163526e (diff) | |
| parent | d40b6cf086734109ec402aa546eca4d3925732ca (diff) | |
| download | rust-6310be458f4665f537419f033a764b0644c7e5ab.tar.gz rust-6310be458f4665f537419f033a764b0644c7e5ab.zip | |
Auto merge of #54601 - cuviper:prep-1.31, r=Mark-Simulacrum
Bump to 1.31.0 and bootstrap from 1.30 beta Closes #54594.
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/lib.rs | 5 | ||||
| -rw-r--r-- | src/liballoc/tests/lib.rs | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index f92075cc84e..5f9ceb8599c 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -76,7 +76,6 @@ #![cfg_attr(not(test), feature(fn_traits))] #![cfg_attr(not(test), feature(generator_trait))] -#![cfg_attr(not(stage0), feature(nll))] #![cfg_attr(test, feature(test))] #![feature(allocator_api)] @@ -87,8 +86,7 @@ #![feature(box_syntax)] #![feature(cfg_target_has_atomic)] #![feature(coerce_unsized)] -#![cfg_attr(stage0, feature(const_fn))] -#![cfg_attr(not(stage0), feature(min_const_fn))] +#![feature(min_const_fn)] #![feature(core_intrinsics)] #![feature(custom_attribute)] #![feature(dropck_eyepatch)] @@ -99,6 +97,7 @@ #![feature(lang_items)] #![feature(libc)] #![feature(needs_allocator)] +#![feature(nll)] #![feature(optin_builtin_traits)] #![feature(pattern)] #![feature(pin)] diff --git a/src/liballoc/tests/lib.rs b/src/liballoc/tests/lib.rs index 6ff39227555..b9ba319a943 100644 --- a/src/liballoc/tests/lib.rs +++ b/src/liballoc/tests/lib.rs @@ -11,8 +11,7 @@ #![feature(allocator_api)] #![feature(alloc_system)] #![feature(box_syntax)] -#![cfg_attr(stage0, feature(const_fn))] -#![cfg_attr(not(stage0), feature(min_const_fn))] +#![feature(min_const_fn)] #![feature(drain_filter)] #![feature(exact_size_is_empty)] #![feature(pattern)] |