Skip to content

Commit a7890c7

Browse files
committed
Auto merge of #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 d568d63 + 9e22b84 commit a7890c7

File tree

43 files changed

+22
-67
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+22
-67
lines changed

compiler/rustc_apfloat/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
#![forbid(unsafe_code)]
3636
#![feature(iter_zip)]
3737
#![feature(nll)]
38-
#![cfg_attr(bootstrap, feature(or_patterns))]
3938

4039
#[macro_use]
4140
extern crate alloc;

compiler/rustc_ast/src/lib.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,13 @@
1010
)]
1111
#![feature(box_syntax)]
1212
#![feature(box_patterns)]
13-
// On bootstrap bump, this will likely have to become const_fn_unsize
14-
#![cfg_attr(bootstrap, feature(const_fn))] // For the `transmute` in `P::new`
13+
#![cfg_attr(bootstrap, feature(const_fn_unsize))]
1514
#![feature(const_fn_transmute)]
1615
#![feature(const_panic)]
1716
#![feature(crate_visibility_modifier)]
1817
#![feature(iter_zip)]
1918
#![feature(label_break_value)]
2019
#![feature(nll)]
21-
#![cfg_attr(bootstrap, feature(or_patterns))]
2220
#![recursion_limit = "256"]
2321

2422
#[macro_use]

compiler/rustc_ast_lowering/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
//! in the HIR, especially for multiple identifiers.
3232
3333
#![feature(crate_visibility_modifier)]
34-
#![cfg_attr(bootstrap, feature(or_patterns))]
3534
#![feature(box_patterns)]
3635
#![feature(iter_zip)]
3736
#![recursion_limit = "256"]

compiler/rustc_ast_pretty/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![feature(bool_to_option)]
22
#![feature(crate_visibility_modifier)]
3-
#![cfg_attr(bootstrap, feature(or_patterns))]
43
#![feature(box_patterns)]
54
#![recursion_limit = "256"]
65

compiler/rustc_attr/src/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
//! The goal is to move the definition of `MetaItem` and things that don't need to be in `syntax`
55
//! to this crate.
66
7-
#![cfg_attr(bootstrap, feature(or_patterns))]
8-
97
#[macro_use]
108
extern crate rustc_macros;
119

compiler/rustc_builtin_macros/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#![feature(decl_macro)]
1010
#![feature(iter_zip)]
1111
#![feature(nll)]
12-
#![cfg_attr(bootstrap, feature(or_patterns))]
1312
#![feature(proc_macro_internals)]
1413
#![feature(proc_macro_quote)]
1514
#![recursion_limit = "256"]

compiler/rustc_codegen_llvm/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#![feature(in_band_lifetimes)]
1414
#![feature(iter_zip)]
1515
#![feature(nll)]
16-
#![cfg_attr(bootstrap, feature(or_patterns))]
1716
#![recursion_limit = "256"]
1817

1918
use back::write::{create_informational_target_machine, create_target_machine};

compiler/rustc_codegen_ssa/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#![feature(try_blocks)]
77
#![feature(in_band_lifetimes)]
88
#![feature(nll)]
9-
#![cfg_attr(bootstrap, feature(or_patterns))]
109
#![feature(associated_type_bounds)]
1110
#![feature(iter_zip)]
1211
#![recursion_limit = "256"]

compiler/rustc_expand/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#![feature(decl_macro)]
44
#![feature(destructuring_assignment)]
55
#![feature(iter_zip)]
6-
#![cfg_attr(bootstrap, feature(or_patterns))]
76
#![feature(proc_macro_diagnostic)]
87
#![feature(proc_macro_internals)]
98
#![feature(proc_macro_span)]

compiler/rustc_hir/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#![cfg_attr(bootstrap, feature(extended_key_value_attributes))]
88
#![feature(in_band_lifetimes)]
99
#![feature(once_cell)]
10-
#![cfg_attr(bootstrap, feature(or_patterns))]
1110
#![recursion_limit = "256"]
1211

1312
#[macro_use]

compiler/rustc_hir_pretty/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#![cfg_attr(bootstrap, feature(or_patterns))]
21
#![recursion_limit = "256"]
32

43
use rustc_ast as ast;

compiler/rustc_infer/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#![feature(extend_one)]
2121
#![feature(iter_zip)]
2222
#![feature(never_type)]
23-
#![cfg_attr(bootstrap, feature(or_patterns))]
2423
#![feature(in_band_lifetimes)]
2524
#![feature(control_flow_enum)]
2625
#![recursion_limit = "512"] // For rustdoc

compiler/rustc_lint/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#![feature(iter_zip)]
3737
#![feature(never_type)]
3838
#![feature(nll)]
39-
#![cfg_attr(bootstrap, feature(or_patterns))]
4039
#![feature(half_open_range_patterns)]
4140
#![feature(exclusive_range_pattern)]
4241
#![feature(control_flow_enum)]

compiler/rustc_metadata/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#![feature(in_band_lifetimes)]
66
#![feature(nll)]
77
#![feature(once_cell)]
8-
#![cfg_attr(bootstrap, feature(or_patterns))]
98
#![feature(proc_macro_internals)]
109
#![feature(min_specialization)]
1110
#![feature(stmt_expr_attributes)]

compiler/rustc_middle/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#![feature(extern_types)]
3737
#![feature(nll)]
3838
#![feature(once_cell)]
39-
#![cfg_attr(bootstrap, feature(or_patterns))]
4039
#![feature(min_specialization)]
4140
#![feature(trusted_len)]
4241
#![feature(test)]

compiler/rustc_mir/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ Rust MIR: a lowered representation of Rust.
2929
#![feature(stmt_expr_attributes)]
3030
#![feature(trait_alias)]
3131
#![feature(option_get_or_insert_default)]
32-
#![cfg_attr(bootstrap, feature(or_patterns))]
3332
#![feature(once_cell)]
3433
#![feature(control_flow_enum)]
3534
#![recursion_limit = "256"]

compiler/rustc_mir_build/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#![feature(bool_to_option)]
1111
#![feature(iter_zip)]
1212
#![feature(once_cell)]
13-
#![cfg_attr(bootstrap, feature(or_patterns))]
1413
#![recursion_limit = "256"]
1514

1615
#[macro_use]

compiler/rustc_parse/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#![feature(crate_visibility_modifier)]
55
#![feature(bindings_after_at)]
66
#![feature(iter_order_by)]
7-
#![cfg_attr(bootstrap, feature(or_patterns))]
87
#![feature(box_syntax)]
98
#![feature(box_patterns)]
109
#![recursion_limit = "256"]

compiler/rustc_parse_format/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
test(attr(deny(warnings)))
1111
)]
1212
#![feature(nll)]
13-
#![cfg_attr(bootstrap, feature(or_patterns))]
1413
#![feature(bool_to_option)]
1514

1615
pub use Alignment::*;

compiler/rustc_passes/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#![feature(in_band_lifetimes)]
1111
#![feature(iter_zip)]
1212
#![feature(nll)]
13-
#![cfg_attr(bootstrap, feature(or_patterns))]
1413
#![recursion_limit = "256"]
1514

1615
#[macro_use]

compiler/rustc_privacy/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
22
#![feature(in_band_lifetimes)]
33
#![feature(nll)]
4-
#![cfg_attr(bootstrap, feature(or_patterns))]
54
#![feature(control_flow_enum)]
65
#![feature(try_blocks)]
76
#![feature(associated_type_defaults)]

compiler/rustc_resolve/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#![feature(format_args_capture)]
1717
#![feature(iter_zip)]
1818
#![feature(nll)]
19-
#![cfg_attr(bootstrap, feature(or_patterns))]
2019
#![recursion_limit = "256"]
2120
#![allow(rustdoc::private_intra_doc_links)]
2221

compiler/rustc_save_analysis/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
22
#![feature(nll)]
3-
#![cfg_attr(bootstrap, feature(or_patterns))]
43
#![recursion_limit = "256"]
54

65
mod dump_visitor;

compiler/rustc_session/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![feature(crate_visibility_modifier)]
22
#![feature(once_cell)]
3-
#![cfg_attr(bootstrap, feature(or_patterns))]
43
#![recursion_limit = "256"]
54

65
#[macro_use]

compiler/rustc_symbol_mangling/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@
9090
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
9191
#![feature(never_type)]
9292
#![feature(nll)]
93-
#![cfg_attr(bootstrap, feature(or_patterns))]
9493
#![feature(in_band_lifetimes)]
9594
#![recursion_limit = "256"]
9695

compiler/rustc_trait_selection/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#![feature(iter_zip)]
2020
#![feature(never_type)]
2121
#![feature(crate_visibility_modifier)]
22-
#![cfg_attr(bootstrap, feature(or_patterns))]
2322
#![feature(control_flow_enum)]
2423
#![recursion_limit = "512"] // For rustdoc
2524

compiler/rustc_typeck/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ This API is completely unstable and subject to change.
6565
#![feature(is_sorted)]
6666
#![feature(iter_zip)]
6767
#![feature(nll)]
68-
#![cfg_attr(bootstrap, feature(or_patterns))]
6968
#![feature(try_blocks)]
7069
#![feature(never_type)]
7170
#![feature(slice_partition_dedup)]

library/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)]

library/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;

library/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) {}

library/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"]

library/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.

library/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 {

library/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)]

library/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)]

library/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
///

library/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)]

0 commit comments

Comments
 (0)