rustup to nightly-2025-04-28

Author: LegNeato

crates/rustc_codegen_spirv/build.rs

@@ -15,9 +15,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-27"
+channel = "nightly-2025-04-28"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = 10fa3c449f6b1613b352a6cbf78d3d91fd9a1d81"#;
+# commit_hash = cb31a009e3e735ab08613cec2d8a5a754e65596f"#;
 
 fn rustc_output(arg: &str) -> Result<String, Box<dyn Error>> {
     let rustc = env::var("RUSTC").unwrap_or_else(|_| "rustc".into());
@@ -259,9 +259,9 @@ pub(crate) fn create_object_file(sess: &Session) -> Option<write::Object<'static
                     continue;
                 }
                 let extern_crate = format!("extern crate {};", name.replace('-', "_"));
-                if !all_extern_crates.contains(&extern_crate) {
-                    writeln(&mut all_extern_crates, "#[allow(unused_extern_crates)]");
-                    writeln(&mut all_extern_crates, &extern_crate);
+                    if !all_extern_crates.contains(&extern_crate) {
+                        writeln(&mut all_extern_crates, "#[allow(unused_extern_crates)]");
+                        writeln(&mut all_extern_crates, &extern_crate);
                 }
             }
         }

crates/rustc_codegen_spirv/src/codegen_cx/declare.rs

@@ -12,7 +12,6 @@ use rspirv::spirv::{FunctionControl, LinkageType, StorageClass, Word};
 use rustc_abi::Align;
 use rustc_attr_parsing::InlineAttr;
 use rustc_codegen_ssa::traits::{PreDefineCodegenMethods, StaticCodegenMethods};
-use rustc_hir::def::DefKind;
 use rustc_middle::bug;
 use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
 use rustc_middle::mir::mono::{Linkage, MonoItem, Visibility};
@@ -133,16 +132,7 @@ impl<'tcx> CodegenCx<'tcx> {
 
         let declared = fn_id.with_type(function_type);
 
-        let attrs = AggregatedSpirvAttributes::parse(
-            self,
-            match self.tcx.def_kind(def_id) {
-                // This was made to ICE cross-crate at some point, but then got
-                // reverted in https://github.com/rust-lang/rust/pull/111381.
-                // FIXME(eddyb) remove this workaround once we rustup past that.
-                DefKind::Closure => &[],
-                _ => self.tcx.get_attrs_unchecked(def_id),
-            },
-        );
+        let attrs = AggregatedSpirvAttributes::parse(self, self.tcx.get_attrs_unchecked(def_id));
         if let Some(entry) = attrs.entry.map(|attr| attr.value) {
             let entry_name = entry
                 .name

rust-toolchain.toml

@@ -1,7 +1,7 @@
 [toolchain]
-channel = "nightly-2025-04-27"
+channel = "nightly-2025-04-28"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = 10fa3c449f6b1613b352a6cbf78d3d91fd9a1d81
+# commit_hash = cb31a009e3e735ab08613cec2d8a5a754e65596f
 
 # 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.