Skip to content

Commit f8060d2

Browse files
committed
Auto merge of rust-lang#128083 - Mark-Simulacrum:bump-bootstrap, r=albertlarsan68
Bump bootstrap compiler to new beta https://forge.rust-lang.org/release/process.html#master-bootstrap-update-t-2-day-tuesday
2 parents 006c8df + abb1eba commit f8060d2

File tree

50 files changed

+511
-635
lines changed

Some content is hidden

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

50 files changed

+511
-635
lines changed

compiler/rustc_builtin_macros/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#![allow(internal_features)]
66
#![allow(rustc::diagnostic_outside_of_impl)]
77
#![allow(rustc::untranslatable_diagnostic)]
8-
#![cfg_attr(bootstrap, feature(lint_reasons))]
98
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
109
#![doc(rust_logo)]
1110
#![feature(assert_matches)]

compiler/rustc_const_eval/src/check_consts/check.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -634,10 +634,7 @@ impl<'tcx> Visitor<'tcx> for Checker<'_, 'tcx> {
634634
trace!(
635635
"visit_projection_elem: place_ref={:?} elem={:?} \
636636
context={:?} location={:?}",
637-
place_ref,
638-
elem,
639-
context,
640-
location,
637+
place_ref, elem, context, location,
641638
);
642639

643640
self.super_projection_elem(place_ref, elem, context, location);

compiler/rustc_const_eval/src/interpret/operator.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -329,11 +329,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
329329
) -> InterpResult<'tcx, ImmTy<'tcx, M::Provenance>> {
330330
trace!(
331331
"Running binary op {:?}: {:?} ({}), {:?} ({})",
332-
bin_op,
333-
*left,
334-
left.layout.ty,
335-
*right,
336-
right.layout.ty
332+
bin_op, *left, left.layout.ty, *right, right.layout.ty
337333
);
338334

339335
match left.layout.ty.kind() {

compiler/rustc_const_eval/src/interpret/terminator.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,8 +431,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
431431
} else {
432432
trace!(
433433
"check_argument_compat: incompatible ABIs:\ncaller: {:?}\ncallee: {:?}",
434-
caller_abi,
435-
callee_abi
434+
caller_abi, callee_abi
436435
);
437436
return Ok(false);
438437
}

compiler/rustc_data_structures/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#![allow(internal_features)]
1111
#![allow(rustc::default_hash_types)]
1212
#![allow(rustc::potential_query_instability)]
13-
#![cfg_attr(bootstrap, feature(lint_reasons))]
1413
#![cfg_attr(not(parallel_compiler), feature(cell_leak))]
1514
#![deny(unsafe_op_in_unsafe_fn)]
1615
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]

compiler/rustc_feature/src/accepted.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ declare_features! (
8686
/// Allows `c"foo"` literals.
8787
(accepted, c_str_literals, "1.77.0", Some(105723)),
8888
/// Allows `extern "C-unwind" fn` to enable unwinding across ABI boundaries and treat `extern "C" fn` as nounwind.
89-
(accepted, c_unwind, "CURRENT_RUSTC_VERSION", Some(74990)),
89+
(accepted, c_unwind, "1.81.0", Some(74990)),
9090
/// Allows `#[cfg_attr(predicate, multiple, attributes, here)]`.
9191
(accepted, cfg_attr_multi, "1.33.0", Some(54881)),
9292
/// Allows the use of `#[cfg(doctest)]`, set when rustdoc is collecting doctests.
@@ -238,7 +238,7 @@ declare_features! (
238238
/// Allows `let...else` statements.
239239
(accepted, let_else, "1.65.0", Some(87335)),
240240
/// Allows using `reason` in lint attributes and the `#[expect(lint)]` lint check.
241-
(accepted, lint_reasons, "CURRENT_RUSTC_VERSION", Some(54503)),
241+
(accepted, lint_reasons, "1.81.0", Some(54503)),
242242
/// Allows `break {expr}` with a value inside `loop`s.
243243
(accepted, loop_break_value, "1.19.0", Some(37339)),
244244
/// Allows use of `?` as the Kleene "at most one" operator in macros.

compiler/rustc_feature/src/removed.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ declare_features! (
223223
(removed, unwind_attributes, "1.56.0", Some(58760), Some("use the C-unwind ABI instead")),
224224
(removed, visible_private_types, "1.0.0", None, None),
225225
/// Allows `extern "wasm" fn`
226-
(removed, wasm_abi, "CURRENT_RUSTC_VERSION", Some(83788),
226+
(removed, wasm_abi, "1.81.0", Some(83788),
227227
Some("non-standard wasm ABI is no longer supported")),
228228
// !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!!
229229
// Features are listed in alphabetical order. Tidy will fail if you don't keep it this way.

compiler/rustc_feature/src/unstable.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ declare_features! (
518518
/// Give access to additional metadata about declarative macro meta-variables.
519519
(unstable, macro_metavar_expr, "1.61.0", Some(83527)),
520520
/// Provides a way to concatenate identifiers using metavariable expressions.
521-
(unstable, macro_metavar_expr_concat, "CURRENT_RUSTC_VERSION", Some(124225)),
521+
(unstable, macro_metavar_expr_concat, "1.81.0", Some(124225)),
522522
/// Allows `#[marker]` on certain traits allowing overlapping implementations.
523523
(unstable, marker_trait_attr, "1.30.0", Some(29864)),
524524
/// Allows exhaustive pattern matching on types that contain uninhabited types in cases that are
@@ -561,11 +561,11 @@ declare_features! (
561561
/// Allows using enums in offset_of!
562562
(unstable, offset_of_enum, "1.75.0", Some(120141)),
563563
/// Allows using fields with slice type in offset_of!
564-
(unstable, offset_of_slice, "CURRENT_RUSTC_VERSION", Some(126151)),
564+
(unstable, offset_of_slice, "1.81.0", Some(126151)),
565565
/// Allows using `#[optimize(X)]`.
566566
(unstable, optimize_attribute, "1.34.0", Some(54882)),
567567
/// Allows specifying nop padding on functions for dynamic patching.
568-
(unstable, patchable_function_entry, "CURRENT_RUSTC_VERSION", Some(123115)),
568+
(unstable, patchable_function_entry, "1.81.0", Some(123115)),
569569
/// Allows postfix match `expr.match { ... }`
570570
(unstable, postfix_match, "1.79.0", Some(121618)),
571571
/// Allows `use<'a, 'b, A, B>` in `impl Trait + use<...>` for precise capture of generic args.
@@ -577,7 +577,7 @@ declare_features! (
577577
/// Makes `&` and `&mut` patterns eat only one layer of references in Rust 2024.
578578
(incomplete, ref_pat_eat_one_layer_2024, "1.79.0", Some(123076)),
579579
/// Makes `&` and `&mut` patterns eat only one layer of references in Rust 2024—structural variant
580-
(incomplete, ref_pat_eat_one_layer_2024_structural, "CURRENT_RUSTC_VERSION", Some(123076)),
580+
(incomplete, ref_pat_eat_one_layer_2024_structural, "1.81.0", Some(123076)),
581581
/// Allows using the `#[register_tool]` attribute.
582582
(unstable, register_tool, "1.41.0", Some(66079)),
583583
/// Allows the `#[repr(i128)]` attribute for enums.
@@ -643,9 +643,9 @@ declare_features! (
643643
/// Allows using the `#[used(linker)]` (or `#[used(compiler)]`) attribute.
644644
(unstable, used_with_arg, "1.60.0", Some(93798)),
645645
/// Allows use of x86 `AMX` target-feature attributes and intrinsics
646-
(unstable, x86_amx_intrinsics, "CURRENT_RUSTC_VERSION", Some(126622)),
646+
(unstable, x86_amx_intrinsics, "1.81.0", Some(126622)),
647647
/// Allows use of the `xop` target-feature
648-
(unstable, xop_target_feature, "CURRENT_RUSTC_VERSION", Some(127208)),
648+
(unstable, xop_target_feature, "1.81.0", Some(127208)),
649649
/// Allows `do yeet` expressions
650650
(unstable, yeet_expr, "1.62.0", Some(96373)),
651651
// !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!!

compiler/rustc_lint_defs/src/builtin.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -617,8 +617,6 @@ declare_lint! {
617617
/// ### Example
618618
///
619619
/// ```rust
620-
/// #![cfg_attr(bootstrap, feature(lint_reasons))]
621-
///
622620
/// #[expect(unused_variables)]
623621
/// let x = 10;
624622
/// println!("{}", x);

compiler/rustc_parse/src/errors.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -555,12 +555,7 @@ pub(crate) enum MissingInInForLoopSub {
555555
code = "in"
556556
)]
557557
InNotOf(#[primary_span] Span),
558-
#[suggestion(
559-
parse_add_in,
560-
style = "verbose",
561-
applicability = "maybe-incorrect",
562-
code = " in "
563-
)]
558+
#[suggestion(parse_add_in, style = "verbose", applicability = "maybe-incorrect", code = " in ")]
564559
AddIn(#[primary_span] Span),
565560
}
566561

0 commit comments

Comments
 (0)