Skip to content

Commit 0df77cd

Browse files
committed
Auto merge of rust-lang#84985 - pietroalbini:bootstrap-1.54, r=Mark-Simulacrum
Bump bootstrap compiler to beta 1.53.0 This PR bumps the bootstrap compiler to version 1.53.0 beta, as part of our usual release process (this was supposed to be Wednesday's step, but creating the beta release took longer than expected). The PR also includes the "Bootstrap: skip rustdoc fingerprint for building docs" commit, see the reasoning [on Zulip](https://zulip-archive.rust-lang.org/241545trelease/88450153betabootstrap.html). r? `@Mark-Simulacrum`
2 parents 6174fa8 + 9bd228a commit 0df77cd

File tree

11 files changed

+17
-33
lines changed

11 files changed

+17
-33
lines changed

alloc/src/lib.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@
8888
#![feature(cfg_target_has_atomic)]
8989
#![feature(coerce_unsized)]
9090
#![cfg_attr(not(no_global_oom_handling), feature(const_btree_new))]
91-
#![cfg_attr(bootstrap, feature(const_fn))]
92-
#![cfg_attr(not(bootstrap), feature(const_fn_trait_bound))]
91+
#![feature(const_fn_trait_bound)]
9392
#![feature(cow_is_borrowed)]
9493
#![feature(const_cow_is_borrowed)]
9594
#![feature(destructuring_assignment)]
@@ -118,7 +117,6 @@
118117
#![feature(nonnull_slice_from_raw_parts)]
119118
#![feature(auto_traits)]
120119
#![feature(option_result_unwrap_unchecked)]
121-
#![cfg_attr(bootstrap, feature(or_patterns))]
122120
#![feature(pattern)]
123121
#![feature(ptr_internals)]
124122
#![feature(rustc_attrs)]

core/src/array/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ impl<T: fmt::Debug, const N: usize> fmt::Debug for [T; N] {
156156
// Note: the `#[rustc_skip_array_during_method_dispatch]` on `trait IntoIterator`
157157
// hides this implementation from explicit `.into_iter()` calls on editions < 2021,
158158
// so those calls will still resolve to the slice implementation, by reference.
159-
#[cfg(not(bootstrap))]
160159
#[stable(feature = "array_into_iter_impl", since = "1.53.0")]
161160
impl<T, const N: usize> IntoIterator for [T; N] {
162161
type Item = T;

core/src/cmp.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ pub trait Eq: PartialEq<Self> {
274274
//
275275
// This should never be implemented by hand.
276276
#[doc(hidden)]
277-
#[cfg_attr(not(bootstrap), no_coverage)] // rust-lang/rust#84605
277+
#[no_coverage] // rust-lang/rust#84605
278278
#[inline]
279279
#[stable(feature = "rust1", since = "1.0.0")]
280280
fn assert_receiver_is_total_eq(&self) {}

core/src/future/future.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ use crate::task::{Context, Poll};
2424
/// `.await` the value.
2525
///
2626
/// [`Waker`]: crate::task::Waker
27-
#[cfg_attr(bootstrap, doc(spotlight))]
28-
#[cfg_attr(not(bootstrap), doc(notable_trait))]
27+
#[doc(notable_trait)]
2928
#[must_use = "futures do nothing unless you `.await` or poll them"]
3029
#[stable(feature = "futures_api", since = "1.36.0")]
3130
#[lang = "future_trait"]

core/src/iter/traits/collect.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ pub trait FromIterator<A>: Sized {
198198
/// }
199199
/// ```
200200
#[rustc_diagnostic_item = "IntoIterator"]
201-
#[cfg_attr(not(bootstrap), rustc_skip_array_during_method_dispatch)]
201+
#[rustc_skip_array_during_method_dispatch]
202202
#[stable(feature = "rust1", since = "1.0.0")]
203203
pub trait IntoIterator {
204204
/// The type of the elements being iterated over.

core/src/iter/traits/iterator.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@ fn _assert_is_object_safe(_: &dyn Iterator<Item = ()>) {}
9292
label = "`{Self}` is not an iterator",
9393
message = "`{Self}` is not an iterator"
9494
)]
95-
#[cfg_attr(bootstrap, doc(spotlight))]
96-
#[cfg_attr(not(bootstrap), doc(notable_trait))]
95+
#[doc(notable_trait)]
9796
#[rustc_diagnostic_item = "Iterator"]
9897
#[must_use = "iterators are lazy and do nothing unless consumed"]
9998
pub trait Iterator {

core/src/lib.rs

+5-8
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@
8282
#![feature(const_refs_to_cell)]
8383
#![feature(const_panic)]
8484
#![feature(const_pin)]
85-
#![cfg_attr(bootstrap, feature(const_fn))]
8685
#![feature(const_fn_union)]
8786
#![feature(const_impl_trait)]
8887
#![feature(const_fn_floating_point_arithmetic)]
8988
#![feature(const_fn_fn_ptr_basics)]
90-
#![cfg_attr(not(bootstrap), feature(const_fn_trait_bound))]
89+
#![feature(const_fn_trait_bound)]
90+
#![cfg_attr(bootstrap, feature(const_fn))]
9191
#![feature(const_option)]
9292
#![feature(const_precise_live_drops)]
9393
#![feature(const_ptr_offset)]
@@ -110,8 +110,7 @@
110110
#![feature(custom_inner_attributes)]
111111
#![feature(decl_macro)]
112112
#![feature(doc_cfg)]
113-
#![cfg_attr(bootstrap, feature(doc_spotlight))]
114-
#![cfg_attr(not(bootstrap), feature(doc_notable_trait))]
113+
#![feature(doc_notable_trait)]
115114
#![feature(duration_consts_2)]
116115
#![cfg_attr(bootstrap, feature(extended_key_value_attributes))]
117116
#![feature(extern_types)]
@@ -127,7 +126,6 @@
127126
#![feature(exhaustive_patterns)]
128127
#![feature(no_core)]
129128
#![feature(auto_traits)]
130-
#![cfg_attr(bootstrap, feature(or_patterns))]
131129
#![feature(prelude_import)]
132130
#![feature(ptr_metadata)]
133131
#![feature(repr_simd, platform_intrinsics)]
@@ -167,7 +165,7 @@
167165
#![feature(const_caller_location)]
168166
#![feature(slice_ptr_get)]
169167
#![feature(no_niche)] // rust-lang/rust#68303
170-
#![cfg_attr(not(bootstrap), feature(no_coverage))] // rust-lang/rust#84605
168+
#![feature(no_coverage)] // rust-lang/rust#84605
171169
#![feature(int_error_matching)]
172170
#![deny(unsafe_op_in_unsafe_fn)]
173171

@@ -304,8 +302,7 @@ pub mod primitive;
304302
unused_imports,
305303
unsafe_op_in_unsafe_fn
306304
)]
307-
#[cfg_attr(bootstrap, allow(rustdoc::non_autolinks))]
308-
#[cfg_attr(not(bootstrap), allow(rustdoc::bare_urls))]
305+
#[allow(rustdoc::bare_urls)]
309306
// FIXME: This annotation should be moved into rust-lang/stdarch after clashing_extern_declarations is
310307
// merged. It currently cannot because bootstrap fails as the lint hasn't been defined yet.
311308
#[allow(clashing_extern_declarations)]

proc_macro/src/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
#![feature(rustc_allow_const_fn_unstable)]
2222
#![feature(nll)]
2323
#![feature(staged_api)]
24-
#![cfg_attr(bootstrap, feature(const_fn))]
25-
#![cfg_attr(not(bootstrap), feature(const_fn_trait_bound))]
24+
#![feature(const_fn_trait_bound)]
2625
#![feature(const_fn_fn_ptr_basics)]
2726
#![feature(allow_internal_unstable)]
2827
#![feature(decl_macro)]

std/src/io/mod.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -509,8 +509,7 @@ pub(crate) fn default_read_exact<R: Read + ?Sized>(this: &mut R, mut buf: &mut [
509509
/// [`std::io`]: self
510510
/// [`File`]: crate::fs::File
511511
#[stable(feature = "rust1", since = "1.0.0")]
512-
#[cfg_attr(bootstrap, doc(spotlight))]
513-
#[cfg_attr(not(bootstrap), doc(notable_trait))]
512+
#[doc(notable_trait)]
514513
pub trait Read {
515514
/// Pull some bytes from this source into the specified buffer, returning
516515
/// how many bytes were read.
@@ -1307,8 +1306,7 @@ impl Initializer {
13071306
///
13081307
/// [`write_all`]: Write::write_all
13091308
#[stable(feature = "rust1", since = "1.0.0")]
1310-
#[cfg_attr(bootstrap, doc(spotlight))]
1311-
#[cfg_attr(not(bootstrap), doc(notable_trait))]
1309+
#[doc(notable_trait)]
13121310
pub trait Write {
13131311
/// Write a buffer into this writer, returning how many bytes were written.
13141312
///

std/src/lib.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,7 @@
260260
#![feature(doc_cfg)]
261261
#![feature(doc_keyword)]
262262
#![feature(doc_masked)]
263-
#![cfg_attr(bootstrap, feature(doc_spotlight))]
264-
#![cfg_attr(not(bootstrap), feature(doc_notable_trait))]
263+
#![feature(doc_notable_trait)]
265264
#![feature(dropck_eyepatch)]
266265
#![feature(duration_constants)]
267266
#![feature(edition_panic)]
@@ -300,7 +299,6 @@
300299
#![feature(nonnull_slice_from_raw_parts)]
301300
#![feature(once_cell)]
302301
#![feature(auto_traits)]
303-
#![cfg_attr(bootstrap, feature(or_patterns))]
304302
#![feature(panic_info_message)]
305303
#![feature(panic_internals)]
306304
#![feature(panic_unwind)]

std/src/primitive_docs.rs

+3-6
Original file line numberDiff line numberDiff line change
@@ -540,8 +540,7 @@ mod prim_pointer {}
540540
///
541541
/// # Examples
542542
///
543-
#[cfg_attr(bootstrap, doc = "```ignore")]
544-
#[cfg_attr(not(bootstrap), doc = "```")]
543+
/// ```
545544
/// let mut array: [i32; 3] = [0; 3];
546545
///
547546
/// array[1] = 1;
@@ -581,8 +580,7 @@ mod prim_pointer {}
581580
/// `IntoIterator` by value. In the future, the behavior on the 2015 and 2018 edition
582581
/// might be made consistent to the behavior of later editions.
583582
///
584-
#[cfg_attr(bootstrap, doc = "```rust,edition2018,ignore")]
585-
#[cfg_attr(not(bootstrap), doc = "```rust,edition2018")]
583+
/// ```rust,edition2018
586584
/// # #![allow(array_into_iter)] // override our `deny(warnings)`
587585
/// let array: [i32; 3] = [0; 3];
588586
///
@@ -637,8 +635,7 @@ mod prim_pointer {}
637635
/// * replace `for ... in array.into_iter() {` with `for ... in array {`,
638636
/// equivalent to the post-2021 behavior (Rust 1.53+)
639637
///
640-
#[cfg_attr(bootstrap, doc = "```rust,edition2018,ignore")]
641-
#[cfg_attr(not(bootstrap), doc = "```rust,edition2018")]
638+
/// ```rust,edition2018
642639
/// use std::array::IntoIter;
643640
///
644641
/// let array: [i32; 3] = [0; 3];

0 commit comments

Comments
 (0)