Skip to content

Commit 6b02110

Browse files
committed
Auto merge of #149831 - BoxyUwU:boostrap_bump, r=Mark-Simulacrum,cuviper
bump bootstrap compiler to 1.93 beta r? release
2 parents 526a91c + 575a02e commit 6b02110

File tree

32 files changed

+605
-611
lines changed

32 files changed

+605
-611
lines changed

compiler/rustc_arena/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
// tidy-alphabetical-start
1111
#![allow(clippy::mut_from_ref)] // Arena allocators are one place where this pattern is fine.
1212
#![allow(internal_features)]
13-
#![cfg_attr(bootstrap, feature(maybe_uninit_slice))]
1413
#![cfg_attr(test, feature(test))]
1514
#![deny(unsafe_op_in_unsafe_fn)]
1615
#![doc(test(no_crate_inject, attr(deny(warnings), allow(internal_features))))]

compiler/rustc_codegen_llvm/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
//! This API is completely unstable and subject to change.
66
77
// tidy-alphabetical-start
8-
#![cfg_attr(bootstrap, feature(slice_as_array))]
98
#![feature(assert_matches)]
109
#![feature(extern_types)]
1110
#![feature(file_buffered)]

compiler/rustc_feature/src/accepted.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ declare_features! (
6161
/// Allows explicit discriminants on non-unit enum variants.
6262
(accepted, arbitrary_enum_discriminant, "1.66.0", Some(60553)),
6363
/// Allows #[cfg(...)] on inline assembly templates and operands.
64-
(accepted, asm_cfg, "CURRENT_RUSTC_VERSION", Some(140364)),
64+
(accepted, asm_cfg, "1.93.0", Some(140364)),
6565
/// Allows using `const` operands in inline assembly.
6666
(accepted, asm_const, "1.82.0", Some(93332)),
6767
/// Allows using `label` operands in inline assembly.
@@ -218,7 +218,7 @@ declare_features! (
218218
/// Allows access to crate names passed via `--extern` through prelude.
219219
(accepted, extern_prelude, "1.30.0", Some(44660)),
220220
/// Allows using `system` as a calling convention with varargs.
221-
(accepted, extern_system_varargs, "CURRENT_RUSTC_VERSION", Some(136946)),
221+
(accepted, extern_system_varargs, "1.93.0", Some(136946)),
222222
/// Allows using F16C intrinsics from `core::arch::{x86, x86_64}`.
223223
(accepted, f16c_target_feature, "1.68.0", Some(44839)),
224224
/// Allows field shorthands (`x` meaning `x: x`) in struct literal expressions.
@@ -392,7 +392,7 @@ declare_features! (
392392
/// Allows code like `let x: &'static u32 = &42` to work (RFC 1414).
393393
(accepted, rvalue_static_promotion, "1.21.0", Some(38865)),
394394
/// Allows use of the `vector` and related s390x target features.
395-
(accepted, s390x_target_feature_vector, "CURRENT_RUSTC_VERSION", Some(145649)),
395+
(accepted, s390x_target_feature_vector, "1.93.0", Some(145649)),
396396
/// Allows `Self` in type definitions (RFC 2300).
397397
(accepted, self_in_typedefs, "1.32.0", Some(49303)),
398398
/// Allows `Self` struct constructor (RFC 2302).

compiler/rustc_feature/src/removed.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ declare_features! (
190190
/// Allows use of unary negate on unsigned integers, e.g., -e for e: u8
191191
(removed, negate_unsigned, "1.0.0", Some(29645), None),
192192
/// Allows diverging expressions to fall back to `!` rather than `()`.
193-
(removed, never_type_fallback, "CURRENT_RUSTC_VERSION", Some(65992), Some("removed in favor of unconditional fallback"), 148871),
193+
(removed, never_type_fallback, "1.93.0", Some(65992), Some("removed in favor of unconditional fallback"), 148871),
194194
/// Allows `#[no_coverage]` on functions.
195195
/// The feature was renamed to `coverage_attribute` and the attribute to `#[coverage(on|off)]`
196196
(removed, no_coverage, "1.74.0", Some(84605), Some("renamed to `coverage_attribute`"), 114656),

compiler/rustc_feature/src/unstable.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ declare_features! (
412412
(unstable, c_variadic, "1.34.0", Some(44930)),
413413
/// Allows defining c-variadic naked functions with any extern ABI that is allowed
414414
/// on c-variadic foreign functions.
415-
(unstable, c_variadic_naked_functions, "CURRENT_RUSTC_VERSION", Some(148767)),
415+
(unstable, c_variadic_naked_functions, "1.93.0", Some(148767)),
416416
/// Allows the use of `#[cfg(contract_checks)` to check if contract checks are enabled.
417417
(unstable, cfg_contract_checks, "1.86.0", Some(128044)),
418418
/// Allows the use of `#[cfg(overflow_checks)` to check if integer overflow behaviour.
@@ -486,7 +486,7 @@ declare_features! (
486486
/// Allows deriving the From trait on single-field structs.
487487
(unstable, derive_from, "1.91.0", Some(144889)),
488488
/// Allows giving non-const impls custom diagnostic messages if attempted to be used as const
489-
(unstable, diagnostic_on_const, "CURRENT_RUSTC_VERSION", Some(143874)),
489+
(unstable, diagnostic_on_const, "1.93.0", Some(143874)),
490490
/// Allows `#[doc(cfg(...))]`.
491491
(unstable, doc_cfg, "1.21.0", Some(43781)),
492492
/// Allows `#[doc(masked)]`.

compiler/rustc_hir/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
//! [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/hir.html
44
55
// tidy-alphabetical-start
6-
#![cfg_attr(bootstrap, feature(debug_closure_helpers))]
76
#![feature(associated_type_defaults)]
87
#![feature(closure_track_caller)]
98
#![feature(const_default)]

compiler/rustc_hir_analysis/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ This API is completely unstable and subject to change.
5858
// tidy-alphabetical-start
5959
#![allow(rustc::diagnostic_outside_of_impl)]
6060
#![allow(rustc::untranslatable_diagnostic)]
61-
#![cfg_attr(bootstrap, feature(debug_closure_helpers))]
6261
#![feature(assert_matches)]
6362
#![feature(gen_blocks)]
6463
#![feature(if_let_guard)]

compiler/rustc_lint/src/builtin.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2683,7 +2683,6 @@ declare_lint! {
26832683
///
26842684
/// ```rust,compile_fail
26852685
/// # #![allow(unused)]
2686-
/// # #![cfg_attr(bootstrap, deny(deref_nullptr))]
26872686
/// use std::ptr;
26882687
/// unsafe {
26892688
/// let x = &*ptr::null::<i32>();

compiler/rustc_lint_defs/src/builtin.rs

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2346,8 +2346,7 @@ declare_lint! {
23462346
/// [sanitize]: https://doc.rust-lang.org/nightly/unstable-book/language-features/no-sanitize.html
23472347
/// ### Example
23482348
///
2349-
#[cfg_attr(bootstrap, doc = "```ignore")]
2350-
#[cfg_attr(not(bootstrap), doc = "```rust,no_run")]
2349+
/// ```rust,no_run
23512350
/// #![feature(sanitize)]
23522351
///
23532352
/// #[sanitize(realtime = "nonblocking")]
@@ -2356,8 +2355,7 @@ declare_lint! {
23562355
/// fn main() {
23572356
/// x();
23582357
/// }
2359-
#[cfg_attr(bootstrap, doc = "```")]
2360-
#[cfg_attr(not(bootstrap), doc = "```")]
2358+
/// ```
23612359
///
23622360
/// {{produces}}
23632361
///
@@ -4907,8 +4905,7 @@ declare_lint! {
49074905
///
49084906
/// ### Example
49094907
///
4910-
#[cfg_attr(bootstrap, doc = "```ignore")]
4911-
#[cfg_attr(not(bootstrap), doc = "```rust,compile_fail")]
4908+
/// ```rust,compile_fail
49124909
/// #![feature(supertrait_item_shadowing)]
49134910
/// #![deny(resolving_to_items_shadowing_supertrait_items)]
49144911
///
@@ -4924,8 +4921,7 @@ declare_lint! {
49244921
///
49254922
/// struct MyType;
49264923
/// MyType.hello();
4927-
#[cfg_attr(bootstrap, doc = "```")]
4928-
#[cfg_attr(not(bootstrap), doc = "```")]
4924+
/// ```
49294925
///
49304926
/// {{produces}}
49314927
///
@@ -4951,8 +4947,7 @@ declare_lint! {
49514947
///
49524948
/// ### Example
49534949
///
4954-
#[cfg_attr(bootstrap, doc = "```ignore")]
4955-
#[cfg_attr(not(bootstrap), doc = "```rust,compile_fail")]
4950+
/// ```rust,compile_fail
49564951
/// #![feature(supertrait_item_shadowing)]
49574952
/// #![deny(shadowing_supertrait_items)]
49584953
///
@@ -4965,8 +4960,7 @@ declare_lint! {
49654960
/// fn hello(&self) {}
49664961
/// }
49674962
/// impl<T> Downstream for T {}
4968-
#[cfg_attr(bootstrap, doc = "```")]
4969-
#[cfg_attr(not(bootstrap), doc = "```")]
4963+
/// ```
49704964
///
49714965
/// {{produces}}
49724966
///

compiler/rustc_target/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
//! LLVM.
99
1010
// tidy-alphabetical-start
11-
#![cfg_attr(bootstrap, feature(debug_closure_helpers))]
1211
#![expect(internal_features)]
1312
#![feature(iter_intersperse)]
1413
#![feature(rustc_attrs)]

0 commit comments

Comments
 (0)