diff options
| author | bors <bors@rust-lang.org> | 2021-04-04 22:45:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-04-04 22:45:56 +0000 |
| commit | 35aa636159b84a771000ee025828798fd959933d (patch) | |
| tree | f5ec26ac4b741ceccc86a0a4b235300a18f7e805 /library/std/src | |
| parent | c755ee4ce8cae6ea977d65a0288480940db721d9 (diff) | |
| parent | f06efd2a24761b3f2b73d9888a8f945de5ec26e4 (diff) | |
| download | rust-35aa636159b84a771000ee025828798fd959933d.tar.gz rust-35aa636159b84a771000ee025828798fd959933d.zip | |
Auto merge of #83530 - Mark-Simulacrum:bootstrap-bump, r=Mark-Simulacrum
Bump bootstrap to 1.52 beta This includes the standard bump, but also a workaround for new cargo behavior around clearing out the doc directory when the rustdoc version changes.
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/lib.rs | 3 | ||||
| -rw-r--r-- | library/std/src/prelude/v1.rs | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index 6ab68100b1d..c983022746c 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -234,7 +234,7 @@ #![feature(box_syntax)] #![feature(c_variadic)] #![feature(cfg_accessible)] -#![cfg_attr(not(bootstrap), feature(cfg_eval))] +#![feature(cfg_eval)] #![feature(cfg_target_has_atomic)] #![feature(cfg_target_thread_local)] #![feature(char_error_internals)] @@ -331,7 +331,6 @@ #![feature(try_blocks)] #![feature(try_reserve)] #![feature(unboxed_closures)] -#![cfg_attr(bootstrap, feature(unsafe_block_in_unsafe_fn))] #![feature(unsafe_cell_raw_get)] #![feature(unwind_attributes)] #![feature(vec_into_raw_parts)] diff --git a/library/std/src/prelude/v1.rs b/library/std/src/prelude/v1.rs index c5b871edbf2..4a3c3ba1635 100644 --- a/library/std/src/prelude/v1.rs +++ b/library/std/src/prelude/v1.rs @@ -54,7 +54,6 @@ pub use core::prelude::v1::{ bench, global_allocator, test, test_case, RustcDecodable, RustcEncodable, }; -#[cfg(not(bootstrap))] #[stable(feature = "builtin_macro_prelude", since = "1.38.0")] #[doc(hidden)] pub use core::prelude::v1::derive; @@ -67,7 +66,6 @@ pub use core::prelude::v1::derive; #[doc(hidden)] pub use core::prelude::v1::cfg_accessible; -#[cfg(not(bootstrap))] #[unstable( feature = "cfg_eval", issue = "82679", |