diff options
| author | bors <bors@rust-lang.org> | 2017-11-29 12:17:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-11-29 12:17:45 +0000 |
| commit | 0a2e9ade83ff253bb489c63a95b1f499c5e0916f (patch) | |
| tree | 6fe2c8003b84d6e710ad6d57b77427b66b9c4ad4 /src/libstd/lib.rs | |
| parent | dc0e227745765c198958f0298785d18bcf61d4ae (diff) | |
| parent | 51bd916af49dff0e88cf3cd01d507aa5fabc6cf8 (diff) | |
| download | rust-0a2e9ade83ff253bb489c63a95b1f499c5e0916f.tar.gz rust-0a2e9ade83ff253bb489c63a95b1f499c5e0916f.zip | |
Auto merge of #46362 - kennytm:rollup, r=kennytm
Rollup of 10 pull requests - Successful merges: #45969, #46077, #46219, #46287, #46293, #46322, #46323, #46330, #46354, #46356 - Failed merges:
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 9587bb424bd..bf177ac7f2c 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -256,15 +256,6 @@ #![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)] @@ -306,7 +297,6 @@ #![feature(repr_align)] #![feature(repr_simd)] #![feature(rustc_attrs)] -#![feature(rustc_const_unstable)] #![feature(shared)] #![feature(sip_hash_13)] #![feature(slice_bytes)] @@ -331,7 +321,6 @@ #![feature(doc_masked)] #![feature(doc_spotlight)] #![cfg_attr(test, feature(update_panic_count))] -#![cfg_attr(windows, feature(const_atomic_ptr_new))] #![cfg_attr(windows, feature(used))] #![default_lib_allocator] |