diff options
| author | bors <bors@rust-lang.org> | 2020-10-08 09:50:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-10-08 09:50:35 +0000 |
| commit | f1dab244d798cda027a327fa43a17547d489511d (patch) | |
| tree | 4399300baec37000901752cf3f1ebb4a63f3fdde /library/std/src | |
| parent | 1565699830e59a6c3c9c4e911da0ee4ea97ae560 (diff) | |
| parent | d8c035abbf534d5e4101c2d4fb804a9e26dd6ccd (diff) | |
| download | rust-f1dab244d798cda027a327fa43a17547d489511d.tar.gz rust-f1dab244d798cda027a327fa43a17547d489511d.zip | |
Auto merge of #77682 - Mark-Simulacrum:bump-stage0, r=pietroalbini
Bump to 1.48 bootstrap compiler r? `@pietroalbini` (but anyone can feel free to review)
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/lib.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index b2bd5f4da50..d4cc2cd239b 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -237,10 +237,10 @@ #![feature(clamp)] #![feature(concat_idents)] #![feature(const_cstr_unchecked)] -#![cfg_attr(not(bootstrap), feature(const_fn_floating_point_arithmetic))] +#![feature(const_fn_floating_point_arithmetic)] #![feature(const_fn_transmute)] #![feature(const_fn)] -#![cfg_attr(not(bootstrap), feature(const_fn_fn_ptr_basics))] +#![feature(const_fn_fn_ptr_basics)] #![feature(const_ip)] #![feature(const_ipv6)] #![feature(const_raw_ptr_deref)] @@ -249,7 +249,6 @@ #![feature(core_intrinsics)] #![feature(custom_test_frameworks)] #![feature(decl_macro)] -#![cfg_attr(bootstrap, feature(doc_alias))] #![feature(doc_cfg)] #![feature(doc_keyword)] #![feature(doc_masked)] |