Merge pull request #4780 from RalfJung/rustup

Rustup

Author: RalfJung

compiler/rustc_arena/src/lib.rs

@@ -10,7 +10,6 @@
 // tidy-alphabetical-start
 #![allow(clippy::mut_from_ref)] // Arena allocators are one place where this pattern is fine.
 #![allow(internal_features)]
-#![cfg_attr(bootstrap, feature(maybe_uninit_slice))]
 #![cfg_attr(test, feature(test))]
 #![deny(unsafe_op_in_unsafe_fn)]
 #![doc(test(no_crate_inject, attr(deny(warnings), allow(internal_features))))]

compiler/rustc_codegen_llvm/src/lib.rs

@@ -5,7 +5,6 @@
 //! This API is completely unstable and subject to change.
 
 // tidy-alphabetical-start
-#![cfg_attr(bootstrap, feature(slice_as_array))]
 #![feature(assert_matches)]
 #![feature(extern_types)]
 #![feature(file_buffered)]

compiler/rustc_codegen_llvm/src/llvm_util.rs

@@ -266,6 +266,10 @@ pub(crate) fn to_llvm_features<'a>(sess: &Session, s: &'a str) -> Option<LLVMFea
  "leoncasa" => Some(LLVMFeature::new("hasleoncasa")),
  s => Some(LLVMFeature::new(s)),
  },
+ Arch::Wasm32 | Arch::Wasm64 => match s {
+ "gc" if major < 22 => None,
+ s => Some(LLVMFeature::new(s)),
+ },
  Arch::X86 | Arch::X86_64 => {
  match s {
  "sse4.2" => Some(LLVMFeature::with_dependencies(
@@ -360,25 +364,25 @@ fn update_target_reliable_float_cfg(sess: &Session, cfg: &mut TargetConfig) {
  let target_abi = &sess.target.options.abi;
  let target_pointer_width = sess.target.pointer_width;
  let version = get_version();
- let lt_20_1_1 = version < (20, 1, 1);
- let lt_21_0_0 = version < (21, 0, 0);
+ let (major, _, _) = version;
 
  cfg.has_reliable_f16 = match (target_arch, target_os) {
- // LLVM crash without neon <https://github.com/llvm/llvm-project/issues/129394> (fixed in llvm20)
+ // LLVM crash without neon <https://github.com/llvm/llvm-project/issues/129394> (fixed in LLVM 20.1.1)
  (Arch::AArch64, _)
- if !cfg.target_features.iter().any(|f| f.as_str() == "neon") && lt_20_1_1 =>
+ if !cfg.target_features.iter().any(|f| f.as_str() == "neon")
+ && version < (20, 1, 1) =>
  {
  false
  }
  // Unsupported <https://github.com/llvm/llvm-project/issues/94434>
  (Arch::Arm64EC, _) => false,
  // Selection failure <https://github.com/llvm/llvm-project/issues/50374> (fixed in llvm21)
- (Arch::S390x, _) if lt_21_0_0 => false,
+ (Arch::S390x, _) if major < 21 => false,
  // MinGW ABI bugs <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115054>
  (Arch::X86_64, Os::Windows) if *target_env == Env::Gnu && *target_abi != Abi::Llvm => false,
  // Infinite recursion <https://github.com/llvm/llvm-project/issues/97981>
  (Arch::CSky, _) => false,
- (Arch::Hexagon, _) if lt_21_0_0 => false, // (fixed in llvm21)
+ (Arch::Hexagon, _) if major < 21 => false, // (fixed in llvm21)
  (Arch::PowerPC | Arch::PowerPC64, _) => false,
  (Arch::Sparc | Arch::Sparc64, _) => false,
  (Arch::Wasm32 | Arch::Wasm64, _) => false,
@@ -389,23 +393,23 @@ fn update_target_reliable_float_cfg(sess: &Session, cfg: &mut TargetConfig) {
  };
 
  cfg.has_reliable_f128 = match (target_arch, target_os) {
+ // Unsupported https://github.com/llvm/llvm-project/issues/121122
+ (Arch::AmdGpu, _) => false,
  // Unsupported <https://github.com/llvm/llvm-project/issues/94434>
  (Arch::Arm64EC, _) => false,
- // Selection bug <https://github.com/llvm/llvm-project/issues/96432> (fixed in llvm20)
- (Arch::Mips64 | Arch::Mips64r6, _) if lt_20_1_1 => false,
+ // Selection bug <https://github.com/llvm/llvm-project/issues/96432> (fixed in LLVM 20.1.0)
+ (Arch::Mips64 | Arch::Mips64r6, _) if version < (20, 1, 0) => false,
  // Selection bug <https://github.com/llvm/llvm-project/issues/95471>. This issue is closed
  // but basic math still does not work.
  (Arch::Nvptx64, _) => false,
- // Unsupported https://github.com/llvm/llvm-project/issues/121122
- (Arch::AmdGpu, _) => false,
  // ABI bugs <https://github.com/rust-lang/rust/issues/125109> et al. (full
  // list at <https://github.com/rust-lang/rust/issues/116909>)
  (Arch::PowerPC | Arch::PowerPC64, _) => false,
  // ABI unsupported <https://github.com/llvm/llvm-project/issues/41838>
  (Arch::Sparc, _) => false,
  // Stack alignment bug <https://github.com/llvm/llvm-project/issues/77401>. NB: tests may
  // not fail if our compiler-builtins is linked. (fixed in llvm21)
- (Arch::X86, _) if lt_21_0_0 => false,
+ (Arch::X86, _) if major < 21 => false,
  // MinGW ABI bugs <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115054>
  (Arch::X86_64, Os::Windows) if *target_env == Env::Gnu && *target_abi != Abi::Llvm => false,
  // There are no known problems on other platforms, so the only requirement is that symbols

compiler/rustc_feature/src/accepted.rs

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

compiler/rustc_feature/src/removed.rs

@@ -190,7 +190,7 @@ declare_features! (
  /// Allows use of unary negate on unsigned integers, e.g., -e for e: u8
  (removed, negate_unsigned, "1.0.0", Some(29645), None),
  /// Allows diverging expressions to fall back to `!` rather than `()`.
- (removed, never_type_fallback, "CURRENT_RUSTC_VERSION", Some(65992), Some("removed in favor of unconditional fallback"), 148871),
+ (removed, never_type_fallback, "1.93.0", Some(65992), Some("removed in favor of unconditional fallback"), 148871),
  /// Allows `#[no_coverage]` on functions.
  /// The feature was renamed to `coverage_attribute` and the attribute to `#[coverage(on|off)]`
  (removed, no_coverage, "1.74.0", Some(84605), Some("renamed to `coverage_attribute`"), 114656),

compiler/rustc_feature/src/unstable.rs

@@ -412,7 +412,7 @@ declare_features! (
  (unstable, c_variadic, "1.34.0", Some(44930)),
  /// Allows defining c-variadic naked functions with any extern ABI that is allowed
  /// on c-variadic foreign functions.
- (unstable, c_variadic_naked_functions, "CURRENT_RUSTC_VERSION", Some(148767)),
+ (unstable, c_variadic_naked_functions, "1.93.0", Some(148767)),
  /// Allows the use of `#[cfg(contract_checks)` to check if contract checks are enabled.
  (unstable, cfg_contract_checks, "1.86.0", Some(128044)),
  /// Allows the use of `#[cfg(overflow_checks)` to check if integer overflow behaviour.
@@ -486,7 +486,7 @@ declare_features! (
  /// Allows deriving the From trait on single-field structs.
  (unstable, derive_from, "1.91.0", Some(144889)),
  /// Allows giving non-const impls custom diagnostic messages if attempted to be used as const
- (unstable, diagnostic_on_const, "CURRENT_RUSTC_VERSION", Some(143874)),
+ (unstable, diagnostic_on_const, "1.93.0", Some(143874)),
  /// Allows `#[doc(cfg(...))]`.
  (unstable, doc_cfg, "1.21.0", Some(43781)),
  /// Allows `#[doc(masked)]`.

compiler/rustc_hir/src/lib.rs

@@ -3,7 +3,6 @@
 //! [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/hir.html
 
 // tidy-alphabetical-start
-#![cfg_attr(bootstrap, feature(debug_closure_helpers))]
 #![feature(associated_type_defaults)]
 #![feature(closure_track_caller)]
 #![feature(const_default)]

compiler/rustc_hir_analysis/src/lib.rs

@@ -58,7 +58,6 @@ This API is completely unstable and subject to change.
 // tidy-alphabetical-start
 #![allow(rustc::diagnostic_outside_of_impl)]
 #![allow(rustc::untranslatable_diagnostic)]
-#![cfg_attr(bootstrap, feature(debug_closure_helpers))]
 #![feature(assert_matches)]
 #![feature(gen_blocks)]
 #![feature(if_let_guard)]

compiler/rustc_lint/src/builtin.rs

@@ -2683,7 +2683,6 @@ declare_lint! {
  ///
  /// ```rust,compile_fail
  /// # #![allow(unused)]
- /// # #![cfg_attr(bootstrap, deny(deref_nullptr))]
  /// use std::ptr;
  /// unsafe {
  /// let x = &*ptr::null::<i32>();

compiler/rustc_lint_defs/src/builtin.rs

@@ -2346,8 +2346,7 @@ declare_lint! {
  /// [sanitize]: https://doc.rust-lang.org/nightly/unstable-book/language-features/no-sanitize.html
  /// ### Example
  ///
- #[cfg_attr(bootstrap, doc = "```ignore")]
- #[cfg_attr(not(bootstrap), doc = "```rust,no_run")]
+ /// ```rust,no_run
  /// #![feature(sanitize)]
  ///
  /// #[sanitize(realtime = "nonblocking")]
@@ -2356,8 +2355,7 @@ declare_lint! {
  /// fn main() {
  /// x();
  /// }
- #[cfg_attr(bootstrap, doc = "```")]
- #[cfg_attr(not(bootstrap), doc = "```")]
+ /// ```
  ///
  /// {{produces}}
  ///
@@ -4907,8 +4905,7 @@ declare_lint! {
  ///
  /// ### Example
  ///
- #[cfg_attr(bootstrap, doc = "```ignore")]
- #[cfg_attr(not(bootstrap), doc = "```rust,compile_fail")]
+ /// ```rust,compile_fail
  /// #![feature(supertrait_item_shadowing)]
  /// #![deny(resolving_to_items_shadowing_supertrait_items)]
  ///
@@ -4924,8 +4921,7 @@ declare_lint! {
  ///
  /// struct MyType;
  /// MyType.hello();
- #[cfg_attr(bootstrap, doc = "```")]
- #[cfg_attr(not(bootstrap), doc = "```")]
+ /// ```
  ///
  /// {{produces}}
  ///
@@ -4951,8 +4947,7 @@ declare_lint! {
  ///
  /// ### Example
  ///
- #[cfg_attr(bootstrap, doc = "```ignore")]
- #[cfg_attr(not(bootstrap), doc = "```rust,compile_fail")]
+ /// ```rust,compile_fail
  /// #![feature(supertrait_item_shadowing)]
  /// #![deny(shadowing_supertrait_items)]
  ///
@@ -4965,8 +4960,7 @@ declare_lint! {
  /// fn hello(&self) {}
  /// }
  /// impl<T> Downstream for T {}
- #[cfg_attr(bootstrap, doc = "```")]
- #[cfg_attr(not(bootstrap), doc = "```")]
+ /// ```
  ///
  /// {{produces}}
  ///