diff options
| author | Josh Stone <jistone@redhat.com> | 2018-09-26 14:26:46 -0700 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2018-09-27 20:52:53 -0700 |
| commit | ce034951fb907c8aa6abd5e6e04769e5e628953c (patch) | |
| tree | 94468d8a5108315f82993dd95328270aefd3e2ec /src/liballoc | |
| parent | 7d52cbce6db83e4fc2d8706b4e4b9c7da76cbcf8 (diff) | |
| download | rust-ce034951fb907c8aa6abd5e6e04769e5e628953c.tar.gz rust-ce034951fb907c8aa6abd5e6e04769e5e628953c.zip | |
Bump to 1.31.0 and bootstrap from 1.30 beta
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 7960936dad6..61348424afa 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)] |