diff options
| author | bors <bors@rust-lang.org> | 2020-07-17 03:51:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-17 03:51:35 +0000 |
| commit | 86c0b85da98a3c69e0fc9014e36e1c88bd3ae8d7 (patch) | |
| tree | c3752892cdc43bf31324ebea11371fa503981bd4 /src/libcore/lib.rs | |
| parent | 8534be72fc3b9c5f2f2dc4e4ee7b651a008e9a3e (diff) | |
| parent | 8321b3fbe44b1edc9b6d012daeaf46ae2b6bc3c8 (diff) | |
| download | rust-86c0b85da98a3c69e0fc9014e36e1c88bd3ae8d7.tar.gz rust-86c0b85da98a3c69e0fc9014e36e1c88bd3ae8d7.zip | |
Auto merge of #74395 - Mark-Simulacrum:stage0-next, r=pietroalbini
Bump version to 1.47 This also bumps to a more recent rustfmt version, just to keep us relatively up to date (though almost nothing has changed in rustfmt we use beyond bumps to the parser infra). No formatting changes as a result of this. r? @pietroalbini
Diffstat (limited to 'src/libcore/lib.rs')
| -rw-r--r-- | src/libcore/lib.rs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index c2dc3e5985f..96436bb253d 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -73,8 +73,6 @@ #![feature(const_ascii_ctype_on_intrinsics)] #![feature(const_alloc_layout)] #![feature(const_discriminant)] -#![cfg_attr(bootstrap, feature(const_if_match))] -#![cfg_attr(bootstrap, feature(const_loop))] #![feature(const_checked_int_methods)] #![feature(const_euclidean_int_methods)] #![feature(const_overflowing_int_methods)] @@ -87,7 +85,7 @@ #![feature(const_generics)] #![feature(const_ptr_offset)] #![feature(const_ptr_offset_from)] -#![cfg_attr(not(bootstrap), feature(const_raw_ptr_comparison))] +#![feature(const_raw_ptr_comparison)] #![feature(const_result)] #![feature(const_slice_from_raw_parts)] #![feature(const_slice_ptr_len)] @@ -121,13 +119,12 @@ #![feature(staged_api)] #![feature(std_internals)] #![feature(stmt_expr_attributes)] -#![cfg_attr(bootstrap, feature(track_caller))] #![feature(transparent_unions)] #![feature(unboxed_closures)] #![feature(unsized_locals)] #![feature(untagged_unions)] #![feature(unwind_attributes)] -#![cfg_attr(not(bootstrap), feature(variant_count))] +#![feature(variant_count)] #![feature(doc_alias)] #![feature(mmx_target_feature)] #![feature(tbm_target_feature)] @@ -142,7 +139,7 @@ #![feature(rtm_target_feature)] #![feature(f16c_target_feature)] #![feature(hexagon_target_feature)] -#![cfg_attr(not(bootstrap), feature(const_fn_transmute))] +#![feature(const_fn_transmute)] #![feature(abi_unadjusted)] #![feature(adx_target_feature)] #![feature(maybe_uninit_slice)] @@ -293,7 +290,7 @@ pub mod primitive; )] // FIXME: This annotation should be moved into rust-lang/stdarch after clashing_extern_declarations is // merged. It currently cannot because bootstrap fails as the lint hasn't been defined yet. -#[cfg_attr(not(bootstrap), allow(clashing_extern_declarations))] +#[allow(clashing_extern_declarations)] #[unstable(feature = "stdsimd", issue = "48556")] mod core_arch; |