Skip to content

Commit 1be1e84

Browse files
borsbors
committed
Auto merge of #117875 - Mark-Simulacrum:bootstrap-bump, r=clubby789
Bootstrap bump Bumps bootstrap compiler to just-released beta. https://forge.rust-lang.org/release/process.html#master-bootstrap-update-t-2-day-tuesday
2 parents cd05ffa + 9e8edb6 commit 1be1e84

File tree

150 files changed

+1250
-1130
lines changed

Some content is hidden

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

150 files changed

+1250
-1130
lines changed

‎compiler/rustc_abi/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#![cfg_attr(feature = "nightly", feature(step_trait))]
22
#![cfg_attr(feature = "nightly", allow(internal_features))]
3-
#![cfg_attr(all(not(bootstrap), feature = "nightly"), doc(rust_logo))]
4-
#![cfg_attr(all(not(bootstrap), feature = "nightly"), feature(rustdoc_internals))]
3+
#![cfg_attr(feature = "nightly", doc(rust_logo))]
4+
#![cfg_attr(feature = "nightly", feature(rustdoc_internals))]
55

66
use std::fmt;
77
use std::num::{NonZeroUsize, ParseIntError};

‎compiler/rustc_arena/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/",
1212
test(no_crate_inject, attr(deny(warnings)))
1313
)]
14-
#![cfg_attr(not(bootstrap), doc(rust_logo))]
15-
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
14+
#![doc(rust_logo)]
15+
#![feature(rustdoc_internals)]
1616
#![feature(core_intrinsics)]
1717
#![feature(dropck_eyepatch)]
1818
#![feature(new_uninit)]

‎compiler/rustc_ast/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/",
99
test(attr(deny(warnings)))
1010
)]
11-
#![cfg_attr(not(bootstrap), doc(rust_logo))]
12-
#![cfg_attr(not(bootstrap), allow(internal_features))]
13-
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
11+
#![doc(rust_logo)]
12+
#![allow(internal_features)]
13+
#![feature(rustdoc_internals)]
1414
#![feature(associated_type_bounds)]
1515
#![feature(box_patterns)]
1616
#![feature(const_trait_impl)]

‎compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
//! get confused if the spans from leaf AST nodes occur in multiple places
3131
//! in the HIR, especially for multiple identifiers.
3232
33-
#![cfg_attr(not(bootstrap), allow(internal_features))]
34-
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
35-
#![cfg_attr(not(bootstrap), doc(rust_logo))]
33+
#![allow(internal_features)]
34+
#![feature(rustdoc_internals)]
35+
#![doc(rust_logo)]
3636
#![feature(box_patterns)]
3737
#![feature(let_chains)]
3838
#![feature(never_type)]

‎compiler/rustc_ast_passes/src/ast_validation.rs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,8 +1213,12 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
12131213
DisallowTildeConstContext::Fn(FnKind::Fn(_, ident, ..)) => {
12141214
errors::TildeConstReason::Function { ident: ident.span }
12151215
}
1216-
&DisallowTildeConstContext::Trait(span) => errors::TildeConstReason::Trait { span },
1217-
&DisallowTildeConstContext::Impl(span) => errors::TildeConstReason::Impl { span },
1216+
&DisallowTildeConstContext::Trait(span) => {
1217+
errors::TildeConstReason::Trait { span }
1218+
}
1219+
&DisallowTildeConstContext::Impl(span) => {
1220+
errors::TildeConstReason::Impl { span }
1221+
}
12181222
DisallowTildeConstContext::TraitObject => {
12191223
errors::TildeConstReason::TraitObject
12201224
}
@@ -1446,9 +1450,7 @@ fn deny_equality_constraints(
14461450
id: rustc_ast::node_id::DUMMY_NODE_ID,
14471451
ident: *ident,
14481452
gen_args,
1449-
kind: AssocConstraintKind::Equality {
1450-
term: predicate.rhs_ty.clone().into(),
1451-
},
1453+
kind: AssocConstraintKind::Equality { term: predicate.rhs_ty.clone().into() },
14521454
span: ident.span,
14531455
});
14541456
// Add `<Bar = RhsTy>` to `Foo`.
@@ -1461,11 +1463,7 @@ fn deny_equality_constraints(
14611463
},
14621464
empty_args => {
14631465
*empty_args = Some(
1464-
AngleBracketedArgs {
1465-
span: ident.span,
1466-
args: thin_vec![arg],
1467-
}
1468-
.into(),
1466+
AngleBracketedArgs { span: ident.span, args: thin_vec![arg] }.into(),
14691467
);
14701468
}
14711469
}

‎compiler/rustc_ast_passes/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
//!
55
//! The crate also contains other misc AST visitors, e.g. `node_count` and `show_span`.
66
7-
#![cfg_attr(not(bootstrap), allow(internal_features))]
8-
#![cfg_attr(not(bootstrap), doc(rust_logo))]
9-
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
7+
#![allow(internal_features)]
8+
#![doc(rust_logo)]
9+
#![feature(rustdoc_internals)]
1010
#![feature(box_patterns)]
1111
#![feature(if_let_guard)]
1212
#![feature(iter_is_partitioned)]

‎compiler/rustc_ast_pretty/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#![cfg_attr(not(bootstrap), allow(internal_features))]
2-
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
3-
#![cfg_attr(not(bootstrap), doc(rust_logo))]
1+
#![allow(internal_features)]
2+
#![feature(rustdoc_internals)]
3+
#![doc(rust_logo)]
44
#![deny(rustc::untranslatable_diagnostic)]
55
#![deny(rustc::diagnostic_outside_of_impl)]
66
#![feature(associated_type_bounds)]

‎compiler/rustc_attr/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
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(not(bootstrap), allow(internal_features))]
8-
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
9-
#![cfg_attr(not(bootstrap), doc(rust_logo))]
7+
#![allow(internal_features)]
8+
#![feature(rustdoc_internals)]
9+
#![doc(rust_logo)]
1010
#![feature(let_chains)]
1111
#![deny(rustc::untranslatable_diagnostic)]
1212
#![deny(rustc::diagnostic_outside_of_impl)]

‎compiler/rustc_baked_icu_data/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
//! --cldr-tag latest --icuexport-tag latest -o src/data
2121
//! ```
2222
23-
#![cfg_attr(not(bootstrap), allow(internal_features))]
24-
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
25-
#![cfg_attr(not(bootstrap), doc(rust_logo))]
23+
#![allow(internal_features)]
24+
#![feature(rustdoc_internals)]
25+
#![doc(rust_logo)]
2626
#![allow(elided_lifetimes_in_paths)]
2727

2828
mod data {

‎compiler/rustc_borrowck/src/diagnostics/move_errors.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,8 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
607607

608608
if let Some(adt) = local_ty.ty_adt_def()
609609
&& adt.repr().packed()
610-
&& let ExpnKind::Macro(MacroKind::Derive, name) = self.body.span.ctxt().outer_expn_data().kind
610+
&& let ExpnKind::Macro(MacroKind::Derive, name) =
611+
self.body.span.ctxt().outer_expn_data().kind
611612
{
612613
err.note(format!("`#[derive({name})]` triggers a move because taking references to the fields of a packed struct is undefined behaviour"));
613614
}

‎compiler/rustc_borrowck/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//! This query borrow-checks the MIR to (further) ensure it is not broken.
22
33
#![allow(internal_features)]
4-
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
5-
#![cfg_attr(not(bootstrap), doc(rust_logo))]
4+
#![feature(rustdoc_internals)]
5+
#![doc(rust_logo)]
66
#![feature(associated_type_bounds)]
77
#![feature(box_patterns)]
88
#![feature(let_chains)]

‎compiler/rustc_builtin_macros/src/format.rs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -617,10 +617,17 @@ fn report_missing_placeholders(
617617
let placeholders = pieces
618618
.iter()
619619
.filter_map(|piece| {
620-
if let parse::Piece::NextArgument(argument) = piece && let ArgumentNamed(binding) = argument.position {
621-
let span = fmt_span.from_inner(InnerSpan::new(argument.position_span.start, argument.position_span.end));
620+
if let parse::Piece::NextArgument(argument) = piece
621+
&& let ArgumentNamed(binding) = argument.position
622+
{
623+
let span = fmt_span.from_inner(InnerSpan::new(
624+
argument.position_span.start,
625+
argument.position_span.end,
626+
));
622627
Some((span, binding))
623-
} else { None }
628+
} else {
629+
None
630+
}
624631
})
625632
.collect::<Vec<_>>();
626633

‎compiler/rustc_builtin_macros/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
//! This crate contains implementations of built-in macros and other code generating facilities
22
//! injecting code into the crate before it is lowered to HIR.
33
4-
#![cfg_attr(not(bootstrap), allow(internal_features))]
5-
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
6-
#![cfg_attr(not(bootstrap), doc(rust_logo))]
4+
#![allow(internal_features)]
5+
#![feature(rustdoc_internals)]
6+
#![doc(rust_logo)]
77
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
88
#![feature(array_windows)]
99
#![feature(box_patterns)]

‎compiler/rustc_codegen_cranelift/build_system/tests.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,8 @@ impl<'a> TestRunner<'a> {
457457
cmd.arg("--target");
458458
cmd.arg(&self.target_compiler.triple);
459459
cmd.arg("-Cpanic=abort");
460+
cmd.arg("--check-cfg=cfg(no_unstable_features)");
461+
cmd.arg("--check-cfg=cfg(jit)");
460462
cmd.args(args);
461463
cmd
462464
}

‎compiler/rustc_codegen_gcc/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
* TODO(antoyo): remove the patches.
1313
*/
1414

15-
#![cfg_attr(not(bootstrap), allow(internal_features))]
16-
#![cfg_attr(not(bootstrap), doc(rust_logo))]
17-
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
15+
#![allow(internal_features)]
16+
#![doc(rust_logo)]
17+
#![feature(rustdoc_internals)]
1818
#![feature(
1919
rustc_private,
2020
decl_macro,

‎compiler/rustc_codegen_llvm/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
//!
55
//! This API is completely unstable and subject to change.
66
7-
#![cfg_attr(not(bootstrap), allow(internal_features))]
8-
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
9-
#![cfg_attr(not(bootstrap), doc(rust_logo))]
7+
#![allow(internal_features)]
8+
#![feature(rustdoc_internals)]
9+
#![doc(rust_logo)]
1010
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
1111
#![feature(exact_size_is_empty)]
1212
#![feature(extern_types)]

‎compiler/rustc_codegen_ssa/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
2-
#![cfg_attr(not(bootstrap), doc(rust_logo))]
3-
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
4-
#![cfg_attr(not(bootstrap), allow(internal_features))]
2+
#![doc(rust_logo)]
3+
#![feature(rustdoc_internals)]
4+
#![allow(internal_features)]
55
#![feature(associated_type_bounds)]
66
#![feature(box_patterns)]
77
#![feature(if_let_guard)]

‎compiler/rustc_const_eval/src/interpret/operator.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,8 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
114114
use rustc_middle::mir::BinOp::*;
115115

116116
// Performs appropriate non-deterministic adjustments of NaN results.
117-
let adjust_nan = |f: F| -> F {
118-
if f.is_nan() { M::generate_nan(self, &[l, r]) } else { f }
119-
};
117+
let adjust_nan =
118+
|f: F| -> F { if f.is_nan() { M::generate_nan(self, &[l, r]) } else { f } };
120119

121120
let val = match bin_op {
122121
Eq => ImmTy::from_bool(l == r, *self.tcx),

‎compiler/rustc_const_eval/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ Rust MIR: a lowered representation of Rust.
44
55
*/
66

7-
#![cfg_attr(not(bootstrap), allow(internal_features))]
8-
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
9-
#![cfg_attr(not(bootstrap), doc(rust_logo))]
7+
#![allow(internal_features)]
8+
#![feature(rustdoc_internals)]
9+
#![doc(rust_logo)]
1010
#![deny(rustc::untranslatable_diagnostic)]
1111
#![feature(assert_matches)]
1212
#![feature(box_patterns)]

‎compiler/rustc_data_structures/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@
1010
#![allow(internal_features)]
1111
#![allow(rustc::default_hash_types)]
1212
#![allow(rustc::potential_query_instability)]
13-
#![cfg_attr(not(bootstrap), doc(rust_logo))]
14-
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
1513
#![deny(rustc::diagnostic_outside_of_impl)]
1614
#![deny(rustc::untranslatable_diagnostic)]
1715
#![deny(unsafe_op_in_unsafe_fn)]
1816
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
17+
#![doc(rust_logo)]
1918
#![feature(allocator_api)]
2019
#![feature(array_windows)]
2120
#![feature(auto_traits)]
@@ -34,6 +33,7 @@
3433
#![feature(never_type)]
3534
#![feature(ptr_alignment_type)]
3635
#![feature(rustc_attrs)]
36+
#![feature(rustdoc_internals)]
3737
#![feature(strict_provenance)]
3838
#![feature(test)]
3939
#![feature(thread_id_value)]

‎compiler/rustc_driver/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// This crate is intentionally empty and a re-export of `rustc_driver_impl` to allow the code in
22
// `rustc_driver_impl` to be compiled in parallel with other crates.
33

4-
#![cfg_attr(not(bootstrap), allow(internal_features))]
5-
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
6-
#![cfg_attr(not(bootstrap), doc(rust_logo))]
4+
#![allow(internal_features)]
5+
#![feature(rustdoc_internals)]
6+
#![doc(rust_logo)]
77

88
pub use rustc_driver_impl::*;

‎compiler/rustc_driver_impl/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
//! This API is completely unstable and subject to change.
66
77
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
8-
#![cfg_attr(not(bootstrap), doc(rust_logo))]
9-
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
10-
#![cfg_attr(not(bootstrap), allow(internal_features))]
8+
#![doc(rust_logo)]
9+
#![feature(rustdoc_internals)]
10+
#![allow(internal_features)]
1111
#![feature(decl_macro)]
1212
#![feature(lazy_cell)]
1313
#![feature(let_chains)]

‎compiler/rustc_error_codes/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#![cfg_attr(not(bootstrap), allow(internal_features))]
2-
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
3-
#![cfg_attr(not(bootstrap), doc(rust_logo))]
1+
#![allow(internal_features)]
2+
#![feature(rustdoc_internals)]
3+
#![doc(rust_logo)]
44
#![deny(rustdoc::invalid_codeblock_attributes)]
55
#![deny(rustc::untranslatable_diagnostic)]
66
#![deny(rustc::diagnostic_outside_of_impl)]

‎compiler/rustc_error_messages/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#![cfg_attr(not(bootstrap), doc(rust_logo))]
2-
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
1+
#![doc(rust_logo)]
2+
#![feature(rustdoc_internals)]
33
#![feature(let_chains)]
44
#![feature(lazy_cell)]
55
#![feature(rustc_attrs)]

‎compiler/rustc_errors/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
//! This module contains the code for creating and emitting diagnostics.
44
55
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
6-
#![cfg_attr(not(bootstrap), doc(rust_logo))]
7-
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
6+
#![doc(rust_logo)]
7+
#![feature(rustdoc_internals)]
88
#![feature(array_windows)]
99
#![feature(extract_if)]
1010
#![feature(if_let_guard)]

‎compiler/rustc_expand/src/config.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ pub fn features(sess: &Session, krate_attrs: &[Attribute], crate_name: Symbol) -
7474
// - E.g. enable `test_2018_feature` if `features_edition` is 2018 or higher
7575
let mut edition_enabled_features = FxHashSet::default();
7676
for f in UNSTABLE_FEATURES {
77-
if let Some(edition) = f.feature.edition && edition <= features_edition {
77+
if let Some(edition) = f.feature.edition
78+
&& edition <= features_edition
79+
{
7880
// FIXME(Manishearth) there is currently no way to set lib features by
7981
// edition.
8082
edition_enabled_features.insert(f.feature.name);
@@ -251,8 +253,7 @@ impl<'a> StripUnconfigured<'a> {
251253
let trees: Vec<_> = stream
252254
.0
253255
.iter()
254-
.flat_map(|tree| {
255-
match tree.clone() {
256+
.flat_map(|tree| match tree.clone() {
256257
AttrTokenTree::Attributes(mut data) => {
257258
data.attrs.flat_map_in_place(|attr| self.process_cfg_attr(&attr));
258259

@@ -277,7 +278,6 @@ impl<'a> StripUnconfigured<'a> {
277278
AttrTokenTree::Token(token, spacing) => {
278279
Some(AttrTokenTree::Token(token, spacing)).into_iter()
279280
}
280-
}
281281
})
282282
.collect();
283283
AttrTokenStream::new(trees)

‎compiler/rustc_expand/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#![cfg_attr(not(bootstrap), doc(rust_logo))]
2-
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
1+
#![doc(rust_logo)]
2+
#![feature(rustdoc_internals)]
33
#![feature(array_windows)]
44
#![feature(associated_type_bounds)]
55
#![feature(associated_type_defaults)]

‎compiler/rustc_feature/src/accepted.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ declare_features! (
6565
/// Allows free and inherent `async fn`s, `async` blocks, and `<expr>.await` expressions.
6666
(accepted, async_await, "1.39.0", Some(50547), None),
6767
/// Allows async functions to be declared, implemented, and used in traits.
68-
(accepted, async_fn_in_trait, "CURRENT_RUSTC_VERSION", Some(91611), None),
68+
(accepted, async_fn_in_trait, "1.75.0", Some(91611), None),
6969
/// Allows all literals in attribute lists and values of key-value pairs.
7070
(accepted, attr_literals, "1.30.0", Some(34981), None),
7171
/// Allows overloading augmented assignment operations like `a += b`.
@@ -306,7 +306,7 @@ declare_features! (
306306
/// Allows `#[repr(transparent)]` attribute on newtype structs.
307307
(accepted, repr_transparent, "1.28.0", Some(43036), None),
308308
/// Allows return-position `impl Trait` in traits.
309-
(accepted, return_position_impl_trait_in_trait, "CURRENT_RUSTC_VERSION", Some(91611), None),
309+
(accepted, return_position_impl_trait_in_trait, "1.75.0", Some(91611), None),
310310
/// Allows code like `let x: &'static u32 = &42` to work (RFC 1414).
311311
(accepted, rvalue_static_promotion, "1.21.0", Some(38865), None),
312312
/// Allows `Self` in type definitions (RFC 2300).

0 commit comments

Comments
 (0)