diff options
| author | bors <bors@rust-lang.org> | 2022-07-03 06:55:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-07-03 06:55:50 +0000 |
| commit | ada8c80bedb713b320af00aacab97d01d9cb5933 (patch) | |
| tree | cf02cbbf9875573f0a5b357ef1829fedfd27202d /library/std/src | |
| parent | 8c52a83c455f0044e00add954cb7d9ddb0dfb9a3 (diff) | |
| parent | d8bfae4f9903a803c8b45d647934f2e53b0b3eea (diff) | |
| download | rust-ada8c80bedb713b320af00aacab97d01d9cb5933.tar.gz rust-ada8c80bedb713b320af00aacab97d01d9cb5933.zip | |
Auto merge of #98673 - pietroalbini:pa-bootstrap-update, r=Mark-Simulacrum
Bump bootstrap compiler r? `@Mark-Simulacrum`
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/lib.rs | 3 | ||||
| -rw-r--r-- | library/std/src/primitive_docs.rs | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index 252b7545a99..298321f41e4 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -251,7 +251,6 @@ #![feature(needs_panic_runtime)] #![feature(negative_impls)] #![feature(never_type)] -#![cfg_attr(bootstrap, feature(nll))] #![feature(platform_intrinsics)] #![feature(prelude_import)] #![feature(rustc_attrs)] @@ -587,7 +586,7 @@ mod backtrace_rs; #[stable(feature = "rust1", since = "1.0.0")] #[allow(deprecated, deprecated_in_future)] pub use core::{ - assert_eq, assert_ne, debug_assert, debug_assert_eq, debug_assert_ne, matches, r#try, todo, + assert_eq, assert_ne, debug_assert, debug_assert_eq, debug_assert_ne, matches, todo, r#try, unimplemented, unreachable, write, writeln, }; diff --git a/library/std/src/primitive_docs.rs b/library/std/src/primitive_docs.rs index 00793f7f920..401c8159988 100644 --- a/library/std/src/primitive_docs.rs +++ b/library/std/src/primitive_docs.rs @@ -996,7 +996,7 @@ impl<T> (T,) {} // Fake impl that's only really used for docs. #[cfg(doc)] #[stable(feature = "rust1", since = "1.0.0")] -#[cfg_attr(not(bootstrap), doc(tuple_variadic))] +#[doc(tuple_variadic)] /// This trait is implemented on arbitrary-length tuples. impl<T: Clone> Clone for (T,) { fn clone(&self) -> Self { @@ -1007,7 +1007,7 @@ impl<T: Clone> Clone for (T,) { // Fake impl that's only really used for docs. #[cfg(doc)] #[stable(feature = "rust1", since = "1.0.0")] -#[cfg_attr(not(bootstrap), doc(tuple_variadic))] +#[doc(tuple_variadic)] /// This trait is implemented on arbitrary-length tuples. impl<T: Copy> Copy for (T,) { // empty |