Skip to content

Commit bed75e7

Browse files
committed
Auto merge of #131767 - cuviper:bump-stage0, r=Mark-Simulacrum
Bump bootstrap compiler to 1.83.0-beta.1 https://forge.rust-lang.org/release/process.html#master-bootstrap-update-tuesday
2 parents 0037048 + cd60224 commit bed75e7

File tree

58 files changed

+644
-755
lines changed

Some content is hidden

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

58 files changed

+644
-755
lines changed

compiler/rustc_const_eval/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// tidy-alphabetical-start
22
#![allow(internal_features)]
33
#![allow(rustc::diagnostic_outside_of_impl)]
4-
#![cfg_attr(not(bootstrap), feature(unqualified_local_imports))]
5-
#![cfg_attr(not(bootstrap), warn(unqualified_local_imports))]
64
#![doc(rust_logo)]
75
#![feature(assert_matches)]
86
#![feature(box_patterns)]
@@ -15,7 +13,9 @@
1513
#![feature(strict_provenance)]
1614
#![feature(trait_alias)]
1715
#![feature(try_blocks)]
16+
#![feature(unqualified_local_imports)]
1817
#![feature(yeet_expr)]
18+
#![warn(unqualified_local_imports)]
1919
#![warn(unreachable_pub)]
2020
// tidy-alphabetical-end
2121

compiler/rustc_data_structures/src/steal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ impl<T> Steal<T> {
5757
///
5858
/// This should not be used within rustc as it leaks information not tracked
5959
/// by the query system, breaking incremental compilation.
60-
#[cfg_attr(not(bootstrap), rustc_lint_untracked_query_information)]
60+
#[rustc_lint_untracked_query_information]
6161
pub fn is_stolen(&self) -> bool {
6262
self.value.borrow().is_none()
6363
}

compiler/rustc_feature/src/accepted.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ declare_features! (
116116
/// Allows calling constructor functions in `const fn`.
117117
(accepted, const_constructor, "1.40.0", Some(61456)),
118118
/// Allows the definition of `const extern fn` and `const unsafe extern fn`.
119-
(accepted, const_extern_fn, "CURRENT_RUSTC_VERSION", Some(64926)),
119+
(accepted, const_extern_fn, "1.83.0", Some(64926)),
120120
/// Allows basic arithmetic on floating point types in a `const fn`.
121121
(accepted, const_fn_floating_point_arithmetic, "1.82.0", Some(57241)),
122122
/// Allows using and casting function pointers in a `const fn`.
@@ -144,15 +144,15 @@ declare_features! (
144144
/// Allows the use of `loop` and `while` in constants.
145145
(accepted, const_loop, "1.46.0", Some(52000)),
146146
/// Allows using `&mut` in constant functions.
147-
(accepted, const_mut_refs, "CURRENT_RUSTC_VERSION", Some(57349)),
147+
(accepted, const_mut_refs, "1.83.0", Some(57349)),
148148
/// Allows panicking during const eval (producing compile-time errors).
149149
(accepted, const_panic, "1.57.0", Some(51999)),
150150
/// Allows dereferencing raw pointers during const eval.
151151
(accepted, const_raw_ptr_deref, "1.58.0", Some(51911)),
152152
/// Allows references to types with interior mutability within constants
153-
(accepted, const_refs_to_cell, "CURRENT_RUSTC_VERSION", Some(80384)),
153+
(accepted, const_refs_to_cell, "1.83.0", Some(80384)),
154154
/// Allows creating pointers and references to `static` items in constants.
155-
(accepted, const_refs_to_static, "CURRENT_RUSTC_VERSION", Some(119618)),
155+
(accepted, const_refs_to_static, "1.83.0", Some(119618)),
156156
/// Allows implementing `Copy` for closures where possible (RFC 2132).
157157
(accepted, copy_closures, "1.26.0", Some(44490)),
158158
/// Allows `crate` in paths.
@@ -190,7 +190,7 @@ declare_features! (
190190
/// Allows explicit generic arguments specification with `impl Trait` present.
191191
(accepted, explicit_generic_args_with_impl_trait, "1.63.0", Some(83701)),
192192
/// Uses 2024 rules for matching `expr` fragments in macros. Also enables `expr_2021` fragment.
193-
(accepted, expr_fragment_specifier_2024, "CURRENT_RUSTC_VERSION", Some(123742)),
193+
(accepted, expr_fragment_specifier_2024, "1.83.0", Some(123742)),
194194
/// Allows arbitrary expressions in key-value attributes at parse time.
195195
(accepted, extended_key_value_attributes, "1.54.0", Some(78835)),
196196
/// Allows resolving absolute paths as paths from other crates.

compiler/rustc_feature/src/removed.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ declare_features! (
156156
(removed, no_stack_check, "1.0.0", None, None),
157157
/// Allows making `dyn Trait` well-formed even if `Trait` is not dyn-compatible (object safe).
158158
/// Renamed to `dyn_compatible_for_dispatch`.
159-
(removed, object_safe_for_dispatch, "CURRENT_RUSTC_VERSION", Some(43561),
159+
(removed, object_safe_for_dispatch, "1.83.0", Some(43561),
160160
Some("renamed to `dyn_compatible_for_dispatch`")),
161161
/// Allows using `#[on_unimplemented(..)]` on traits.
162162
/// (Moved to `rustc_attrs`.)
@@ -221,7 +221,7 @@ declare_features! (
221221
/// Allows using items which are missing stability attributes
222222
(removed, unmarked_api, "1.0.0", None, None),
223223
/// Allows unnamed fields of struct and union type
224-
(removed, unnamed_fields, "CURRENT_RUSTC_VERSION", Some(49804), Some("feature needs redesign")),
224+
(removed, unnamed_fields, "1.83.0", Some(49804), Some("feature needs redesign")),
225225
(removed, unsafe_no_drop_flag, "1.0.0", None, None),
226226
/// Allows `union` fields that don't implement `Copy` as long as they don't have any drop glue.
227227
(removed, untagged_unions, "1.13.0", Some(55149),

compiler/rustc_feature/src/unstable.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ declare_features! (
228228
/// Added for testing unstable lints; perma-unstable.
229229
(internal, test_unstable_lint, "1.60.0", None),
230230
/// Helps with formatting for `group_imports = "StdExternalCrate"`.
231-
(unstable, unqualified_local_imports, "CURRENT_RUSTC_VERSION", None),
231+
(unstable, unqualified_local_imports, "1.83.0", None),
232232
/// Use for stable + negative coherence and strict coherence depending on trait's
233233
/// rustc_strict_coherence value.
234234
(unstable, with_negative_coherence, "1.60.0", None),
@@ -266,7 +266,7 @@ declare_features! (
266266
/// Renamed from `object_safe_for_dispatch`.
267267
///
268268
/// [^1]: Formerly known as "object safe".
269-
(unstable, dyn_compatible_for_dispatch, "CURRENT_RUSTC_VERSION", Some(43561)),
269+
(unstable, dyn_compatible_for_dispatch, "1.83.0", Some(43561)),
270270
/// Allows using the `#[fundamental]` attribute.
271271
(unstable, fundamental, "1.0.0", Some(29635)),
272272
/// Allows using `#[link_name="llvm.*"]`.
@@ -360,7 +360,7 @@ declare_features! (
360360
/// Allows inherent and trait methods with arbitrary self types.
361361
(unstable, arbitrary_self_types, "1.23.0", Some(44874)),
362362
/// Allows inherent and trait methods with arbitrary self types that are raw pointers.
363-
(unstable, arbitrary_self_types_pointers, "CURRENT_RUSTC_VERSION", Some(44874)),
363+
(unstable, arbitrary_self_types_pointers, "1.83.0", Some(44874)),
364364
/// Enables experimental inline assembly support for additional architectures.
365365
(unstable, asm_experimental_arch, "1.58.0", Some(93335)),
366366
/// Allows using `label` operands in inline assembly.
@@ -380,7 +380,7 @@ declare_features! (
380380
/// Allows using C-variadics.
381381
(unstable, c_variadic, "1.34.0", Some(44930)),
382382
/// Allows the use of `#[cfg(<true/false>)]`.
383-
(unstable, cfg_boolean_literals, "CURRENT_RUSTC_VERSION", Some(131204)),
383+
(unstable, cfg_boolean_literals, "1.83.0", Some(131204)),
384384
/// Allows the use of `#[cfg(overflow_checks)` to check if integer overflow behaviour.
385385
(unstable, cfg_overflow_checks, "1.71.0", Some(111466)),
386386
/// Provides the relocation model information as cfg entry
@@ -498,7 +498,7 @@ declare_features! (
498498
/// Allows `if let` guard in match arms.
499499
(unstable, if_let_guard, "1.47.0", Some(51114)),
500500
/// Rescoping temporaries in `if let` to align with Rust 2024.
501-
(unstable, if_let_rescope, "CURRENT_RUSTC_VERSION", Some(124085)),
501+
(unstable, if_let_rescope, "1.83.0", Some(124085)),
502502
/// Allows `impl Trait` to be used inside associated types (RFC 2515).
503503
(unstable, impl_trait_in_assoc_type, "1.70.0", Some(63063)),
504504
/// Allows `impl Trait` as output type in `Fn` traits in return position of functions.
@@ -563,11 +563,11 @@ declare_features! (
563563
/// Allows specifying nop padding on functions for dynamic patching.
564564
(unstable, patchable_function_entry, "1.81.0", Some(123115)),
565565
/// Experimental features that make `Pin` more ergonomic.
566-
(incomplete, pin_ergonomics, "CURRENT_RUSTC_VERSION", Some(130494)),
566+
(incomplete, pin_ergonomics, "1.83.0", Some(130494)),
567567
/// Allows postfix match `expr.match { ... }`
568568
(unstable, postfix_match, "1.79.0", Some(121618)),
569569
/// Allows `use<..>` precise capturign on impl Trait in traits.
570-
(unstable, precise_capturing_in_traits, "CURRENT_RUSTC_VERSION", Some(130044)),
570+
(unstable, precise_capturing_in_traits, "1.83.0", Some(130044)),
571571
/// Allows macro attributes on expressions, statements and non-inline modules.
572572
(unstable, proc_macro_hygiene, "1.30.0", Some(54727)),
573573
/// Makes `&` and `&mut` patterns eat only one layer of references in Rust 2024.

compiler/rustc_lint/src/if_let_rescope.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ declare_lint! {
2424
/// ### Example
2525
///
2626
/// ```rust,edition2021
27-
/// #![cfg_attr(not(bootstrap), feature(if_let_rescope))] // Simplify this in bootstrap bump.
27+
/// #![feature(if_let_rescope)]
2828
/// #![warn(if_let_rescope)]
2929
/// #![allow(unused_variables)]
3030
///

compiler/rustc_lint_defs/src/builtin.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1871,7 +1871,6 @@ declare_lint! {
18711871
/// ### Example
18721872
///
18731873
/// ```rust,compile_fail
1874-
/// # #[cfg_attr(bootstrap)] compile_error!(); // Remove this in bootstrap bump.
18751874
/// #![deny(elided_named_lifetimes)]
18761875
/// struct Foo;
18771876
/// impl Foo {

compiler/rustc_next_trait_solver/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
//! So if you got to this crate from the old solver, it's totally normal.
66
77
// tidy-alphabetical-start
8-
#![cfg_attr(not(bootstrap), allow(rustc::usage_of_type_ir_inherent))]
8+
#![allow(rustc::usage_of_type_ir_inherent)]
99
#![warn(unreachable_pub)]
1010
// tidy-alphabetical-end
1111

compiler/rustc_type_ir/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// tidy-alphabetical-start
22
#![allow(rustc::usage_of_ty_tykind)]
3+
#![allow(rustc::usage_of_type_ir_inherent)]
34
#![cfg_attr(
45
feature = "nightly",
56
feature(associated_type_defaults, never_type, rustc_attrs, negative_impls)
67
)]
78
#![cfg_attr(feature = "nightly", allow(internal_features))]
8-
#![cfg_attr(not(bootstrap), allow(rustc::usage_of_type_ir_inherent))]
99
#![warn(unreachable_pub)]
1010
// tidy-alphabetical-end
1111

library/alloc/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,6 @@
163163
//
164164
// Language features:
165165
// tidy-alphabetical-start
166-
#![cfg_attr(bootstrap, feature(const_mut_refs))]
167-
#![cfg_attr(bootstrap, feature(const_refs_to_cell))]
168166
#![cfg_attr(not(test), feature(coroutine_trait))]
169167
#![cfg_attr(test, feature(panic_update_hook))]
170168
#![cfg_attr(test, feature(test))]

0 commit comments

Comments
 (0)