diff options
| author | bors <bors@rust-lang.org> | 2017-10-27 18:00:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-10-27 18:00:32 +0000 |
| commit | d9f124965551e8fb9403def6a715e13dfd5e9c95 (patch) | |
| tree | e3b0abf4124b9daa7f63d3dbe1c6f800eba73e2a /src/libstd/lib.rs | |
| parent | bed9a85c40f98ab8f4445b66d285d4108de9ad21 (diff) | |
| parent | 8ceacf4e1138d382da3c58ef5f8e0791c00fe100 (diff) | |
Auto merge of #45285 - alexcrichton:update-bootstrap, r=Mark-Simulacrum
Bump to 1.23 and update bootstrap This commit updates the bootstrap compiler, bumps the version to 1.23, updates Cargo, updates books, and updates crates.io dependencies
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 83cc9ce582e..012883d0853 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -254,6 +254,15 @@ #![feature(collections_range)] #![feature(compiler_builtins_lib)] #![feature(const_fn)] +#![feature(const_max_value)] +#![feature(const_atomic_bool_new)] +#![feature(const_atomic_isize_new)] +#![feature(const_atomic_usize_new)] +#![feature(const_unsafe_cell_new)] +#![feature(const_cell_new)] +#![feature(const_once_new)] +#![feature(const_ptr_null)] +#![feature(const_ptr_null_mut)] #![feature(core_float)] #![feature(core_intrinsics)] #![feature(dropck_eyepatch)] @@ -294,7 +303,7 @@ #![feature(repr_align)] #![feature(repr_simd)] #![feature(rustc_attrs)] -#![cfg_attr(not(stage0), feature(rustc_const_unstable))] +#![feature(rustc_const_unstable)] #![feature(shared)] #![feature(sip_hash_13)] #![feature(slice_bytes)] @@ -318,17 +327,7 @@ #![feature(doc_cfg)] #![feature(doc_masked)] #![cfg_attr(test, feature(update_panic_count))] - -#![cfg_attr(not(stage0), feature(const_max_value))] -#![cfg_attr(not(stage0), feature(const_atomic_bool_new))] -#![cfg_attr(not(stage0), feature(const_atomic_isize_new))] -#![cfg_attr(not(stage0), feature(const_atomic_usize_new))] -#![cfg_attr(all(not(stage0), windows), feature(const_atomic_ptr_new))] -#![cfg_attr(not(stage0), feature(const_unsafe_cell_new))] -#![cfg_attr(not(stage0), feature(const_cell_new))] -#![cfg_attr(not(stage0), feature(const_once_new))] -#![cfg_attr(not(stage0), feature(const_ptr_null))] -#![cfg_attr(not(stage0), feature(const_ptr_null_mut))] +#![cfg_attr(windows, feature(const_atomic_ptr_new))] #![default_lib_allocator] |