rustup: update to nightly-2024-12-25.

Author: eddyb

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-2024-12-20"
+channel = "nightly-2024-12-25"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = 9e136a30a965bf4e63f03095c57df7257bf96fd6"#;
+# commit_hash = 409998c4e8cae45344fd434b358b697cc93870d0"#;
 
 fn rustc_output(arg: &str) -> Result<String, Box<dyn Error>> {
     let rustc = env::var("RUSTC").unwrap_or_else(|_| "rustc".into());

crates/rustc_codegen_spirv/src/link.rs

@@ -434,7 +434,7 @@ fn add_upstream_rust_crates(
         .expect("failed to find crate type in dependency format list");
     for &cnum in &codegen_results.crate_info.used_crates {
         let src = &codegen_results.crate_info.used_crate_source[&cnum];
-        match data[cnum.as_usize() - 1] {
+        match data[cnum] {
             Linkage::NotLinked | Linkage::IncludedFromDylib => {}
             Linkage::Static => rlibs.push(src.rlib.as_ref().unwrap().0.clone()),
             //Linkage::Dynamic => rlibs.push(src.dylib.as_ref().unwrap().0.clone()),
@@ -465,7 +465,7 @@ fn add_upstream_native_libraries(
                 NativeLibKind::Static {
                     bundle: Some(false),
                     ..
-                } if data[cnum.as_usize() - 1] != Linkage::Static => {}
+                } if data[cnum] != Linkage::Static => {}
 
                 NativeLibKind::Static {
                     bundle: None | Some(true),

rust-toolchain.toml

@@ -1,7 +1,7 @@
 [toolchain]
-channel = "nightly-2024-12-20"
+channel = "nightly-2024-12-25"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = 9e136a30a965bf4e63f03095c57df7257bf96fd6
+# commit_hash = 409998c4e8cae45344fd434b358b697cc93870d0
 
 # 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.