rustup: update to nightly-2025-04-27.

Author: eddyb

.cargo/config.toml

@@ -56,7 +56,6 @@ rustflags = [
     "-Wclippy::map_err_ignore",
     "-Wclippy::map_flatten",
     "-Wclippy::map_unwrap_or",
-    "-Wclippy::match_on_vec_items",
     "-Wclippy::match_same_arms",
     "-Wclippy::match_wild_err_arm",
     "-Wclippy::match_wildcard_for_single_variants",

crates/rustc_codegen_spirv/build.rs

@@ -18,9 +18,9 @@ use std::{env, fs, mem};
 /// `cargo publish`. We need to figure out a way to do this properly, but let's hardcode it for now :/
 //const REQUIRED_RUST_TOOLCHAIN: &str = include_str!("../../rust-toolchain.toml");
 const REQUIRED_RUST_TOOLCHAIN: &str = r#"[toolchain]
-channel = "nightly-2025-04-14"
+channel = "nightly-2025-04-27"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = 092a284ba0421695f2032c947765429fd7095796"#;
+# commit_hash = 10fa3c449f6b1613b352a6cbf78d3d91fd9a1d81"#;
 
 fn rustc_output(arg: &str) -> Result<String, Box<dyn Error>> {
     let rustc = env::var("RUSTC").unwrap_or_else(|_| "rustc".into());
@@ -320,6 +320,9 @@ mod maybe_pqp_cg_ssa;
     // HACK(eddyb) `if cfg!(llvm_enzyme)` added upstream for autodiff support.
     println!("cargo::rustc-check-cfg=cfg(llvm_enzyme)");
 
+    // HACK(eddyb) `cfg_attr(bootstrap, ...` used upstream temporarily.
+    println!("cargo::rustc-check-cfg=cfg(bootstrap)");
+
     Ok(())
 }
 

crates/rustc_codegen_spirv/src/builder/builder_methods.rs

@@ -210,25 +210,15 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 )),
             },
             SpirvType::Integer(width, true) => match width {
-                8 => self
-                    .constant_i8(self.span(), unsafe {
-                        std::mem::transmute::<u8, i8>(fill_byte)
-                    })
-                    .def(self),
+                8 => self.constant_i8(self.span(), fill_byte as i8).def(self),
                 16 => self
-                    .constant_i16(self.span(), unsafe {
-                        std::mem::transmute::<u16, i16>(memset_fill_u16(fill_byte))
-                    })
+                    .constant_i16(self.span(), memset_fill_u16(fill_byte) as i16)
                     .def(self),
                 32 => self
-                    .constant_i32(self.span(), unsafe {
-                        std::mem::transmute::<u32, i32>(memset_fill_u32(fill_byte))
-                    })
+                    .constant_i32(self.span(), memset_fill_u32(fill_byte) as i32)
                     .def(self),
                 64 => self
-                    .constant_i64(self.span(), unsafe {
-                        std::mem::transmute::<u64, i64>(memset_fill_u64(fill_byte))
-                    })
+                    .constant_i64(self.span(), memset_fill_u64(fill_byte) as i64)
                     .def(self),
                 _ => self.fatal(format!(
                     "memset on integer width {width} not implemented yet"

crates/rustc_codegen_spirv/src/lib.rs

@@ -2,12 +2,11 @@
 #![allow(internal_features)]
 #![allow(rustc::diagnostic_outside_of_impl)]
 #![allow(rustc::untranslatable_diagnostic)]
-#![cfg_attr(doc, recursion_limit = "256")] // FIXME(nnethercote): will be removed by #124141
+#![cfg_attr(bootstrap, feature(let_chains))]
 #![feature(assert_matches)]
 #![feature(box_patterns)]
 #![feature(file_buffered)]
 #![feature(if_let_guard)]
-#![feature(let_chains)]
 #![feature(negative_impls)]
 #![feature(rustdoc_internals)]
 #![feature(string_from_utf8_lossy_owned)]
@@ -37,7 +36,6 @@
 // crate-specific exceptions:
 #![allow(
     unsafe_code,                // rustc_codegen_ssa requires unsafe functions in traits to be impl'd
-    clippy::match_on_vec_items, // rustc_codegen_spirv has less strict panic requirements than other embark projects
     clippy::enum_glob_use,      // pretty useful pattern with some codegen'd enums (e.g. rspirv::spirv::Op)
     clippy::todo,               // still lots to implement :)
 

crates/spirv-builder/src/lib.rs

@@ -36,7 +36,6 @@
     clippy::map_err_ignore,
     clippy::map_flatten,
     clippy::map_unwrap_or,
-    clippy::match_on_vec_items,
     clippy::match_same_arms,
     clippy::match_wildcard_for_single_variants,
     clippy::mem_forget,

crates/spirv-std/macros/src/lib.rs

@@ -36,7 +36,6 @@
     clippy::map_err_ignore,
     clippy::map_flatten,
     clippy::map_unwrap_or,
-    clippy::match_on_vec_items,
     clippy::match_same_arms,
     clippy::match_wildcard_for_single_variants,
     clippy::mem_forget,

crates/spirv-std/src/lib.rs

@@ -42,7 +42,6 @@
     clippy::map_err_ignore,
     clippy::map_flatten,
     clippy::map_unwrap_or,
-    clippy::match_on_vec_items,
     clippy::match_same_arms,
     clippy::match_wildcard_for_single_variants,
     clippy::mem_forget,

examples/runners/ash/src/main.rs

@@ -36,7 +36,6 @@
     clippy::map_err_ignore,
     clippy::map_flatten,
     clippy::map_unwrap_or,
-    clippy::match_on_vec_items,
     clippy::match_same_arms,
     clippy::match_wildcard_for_single_variants,
     clippy::mem_forget,

examples/runners/cpu/src/main.rs

@@ -36,7 +36,6 @@
     clippy::map_err_ignore,
     clippy::map_flatten,
     clippy::map_unwrap_or,
-    clippy::match_on_vec_items,
     clippy::match_same_arms,
     clippy::match_wildcard_for_single_variants,
     clippy::mem_forget,

rust-toolchain.toml

@@ -1,7 +1,7 @@
 [toolchain]
-channel = "nightly-2025-04-14"
+channel = "nightly-2025-04-27"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = 092a284ba0421695f2032c947765429fd7095796
+# commit_hash = 10fa3c449f6b1613b352a6cbf78d3d91fd9a1d81
 
 # Whenever changing the nightly channel, update the commit hash above, and make
 # sure to change `REQUIRED_TOOLCHAIN` in `crates/rustc_codegen_spirv/build.rs` also.

tests/ui/dis/issue-1062.stderr

@@ -4,7 +4,7 @@ OpLine %5 11 12
 %6 = OpLoad  %7  %8
 OpLine %5 11 35
 %9 = OpLoad  %7  %10
-OpLine %11 1098 4
+OpLine %11 1108 4
 %12 = OpBitwiseAnd  %7  %9 %13
 %14 = OpISub  %7  %15 %12
 %16 = OpShiftLeftLogical  %7  %6 %12

tests/ui/dis/ptr_copy.normal.stderr

@@ -1,13 +1,13 @@
 error: cannot memcpy dynamically sized data
-    --> $CORE_SRC/intrinsics/mod.rs:3806:9
+    --> $CORE_SRC/intrinsics/mod.rs:3851:9
      |
-3806 |         copy(src, dst, count)
+3851 |         copy(src, dst, count)
      |         ^^^^^^^^^^^^^^^^^^^^^
      |
 note: used from within `core::intrinsics::copy::<f32>`
-    --> $CORE_SRC/intrinsics/mod.rs:3786:21
+    --> $CORE_SRC/intrinsics/mod.rs:3831:21
      |
-3786 | pub const unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize) {
+3831 | pub const unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize) {
      |                     ^^^^
 note: called by `ptr_copy::copy_via_raw_ptr`
     --> $DIR/ptr_copy.rs:28:18
@@ -28,25 +28,25 @@ note: called by `main`
 error: cannot cast between pointer types
        from `*f32`
          to `*struct () {  }`
-    --> $CORE_SRC/intrinsics/mod.rs:3794:9
+    --> $CORE_SRC/intrinsics/mod.rs:3839:9
      |
-3794 | /         ub_checks::assert_unsafe_precondition!(
-3795 | |             check_language_ub,
-3796 | |             "ptr::copy requires that both pointer arguments are aligned and non-null",
+3839 | /         ub_checks::assert_unsafe_precondition!(
+3840 | |             check_language_ub,
+3841 | |             "ptr::copy requires that both pointer arguments are aligned and non-null",
 ...    |
-3804 | |                 && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
-3805 | |         );
+3849 | |                 && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
+3850 | |         );
      | |_________^
      |
 note: used from within `core::intrinsics::copy::<f32>`
-    --> $CORE_SRC/intrinsics/mod.rs:3794:9
+    --> $CORE_SRC/intrinsics/mod.rs:3839:9
      |
-3794 | /         ub_checks::assert_unsafe_precondition!(
-3795 | |             check_language_ub,
-3796 | |             "ptr::copy requires that both pointer arguments are aligned and non-null",
+3839 | /         ub_checks::assert_unsafe_precondition!(
+3840 | |             check_language_ub,
+3841 | |             "ptr::copy requires that both pointer arguments are aligned and non-null",
 ...    |
-3804 | |                 && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
-3805 | |         );
+3849 | |                 && ub_checks::maybe_is_aligned_and_not_null(dst, align, zero_size)
+3850 | |         );
      | |_________^
 note: called by `ptr_copy::copy_via_raw_ptr`
     --> $DIR/ptr_copy.rs:28:18

tests/ui/lang/core/unwrap_or.stderr

@@ -3,9 +3,9 @@
 OpLine %5 13 11
 %6 = OpCompositeInsert  %7  %8 %9 0
 %10 = OpCompositeExtract  %11  %6 1
-OpLine %12 999 14
+OpLine %12 1024 14
 %13 = OpBitcast  %14  %8
-OpLine %12 999 8
+OpLine %12 1024 8
 %15 = OpINotEqual  %16  %13 %17
 OpNoLine
 OpSelectionMerge %18 None