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

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-17"
+channel = "nightly-2024-12-20"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = 6d9f6ae36ae1299d6126ba40c15191f7aa3b79d8"#;
+# commit_hash = 9e136a30a965bf4e63f03095c57df7257bf96fd6"#;
 
 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/abi.rs

@@ -125,6 +125,7 @@ pub(crate) fn provide(providers: &mut Providers) {
                 },
             },
             variants: match *variants {
+                Variants::Empty => Variants::Empty,
                 Variants::Single { index } => Variants::Single { index },
                 Variants::Multiple {
                     tag,
@@ -652,6 +653,7 @@ fn dig_scalar_pointee<'tcx>(
     }
 
     let all_fields = (match &layout.variants {
+        Variants::Empty => 0..0,
         Variants::Multiple { variants, .. } => 0..variants.len(),
         Variants::Single { index } => {
             let i = index.as_usize();
@@ -867,7 +869,7 @@ impl<'tcx> From<TyAndLayout<'tcx>> for TyLayoutNameKey<'tcx> {
             ty: layout.ty,
             variant: match layout.variants {
                 Variants::Single { index } => Some(index),
-                Variants::Multiple { .. } => None,
+                _ => None,
             },
         }
     }

crates/rustc_codegen_spirv/src/codegen_cx/declare.rs

@@ -9,7 +9,7 @@ use crate::custom_decorations::{CustomDecoration, SrcLocDecoration};
 use crate::spirv_type::SpirvType;
 use itertools::Itertools;
 use rspirv::spirv::{FunctionControl, LinkageType, StorageClass, Word};
-use rustc_attr::InlineAttr;
+use rustc_attr_parsing::InlineAttr;
 use rustc_codegen_ssa::traits::{PreDefineCodegenMethods, StaticCodegenMethods};
 use rustc_hir::def::DefKind;
 use rustc_middle::bug;

crates/rustc_codegen_spirv/src/lib.rs

@@ -85,7 +85,7 @@ extern crate rustc_arena;
 #[cfg(rustc_codegen_spirv_disable_pqp_cg_ssa)]
 extern crate rustc_ast;
 #[cfg(rustc_codegen_spirv_disable_pqp_cg_ssa)]
-extern crate rustc_attr;
+extern crate rustc_attr_parsing;
 #[cfg(rustc_codegen_spirv_disable_pqp_cg_ssa)]
 extern crate rustc_codegen_ssa;
 #[cfg(rustc_codegen_spirv_disable_pqp_cg_ssa)]

crates/rustc_codegen_spirv/src/link.rs

@@ -485,7 +485,7 @@ fn add_upstream_native_libraries(
 // (see `compiler/rustc_codegen_ssa/src/back/link.rs`)
 fn relevant_lib(sess: &Session, lib: &NativeLib) -> bool {
     match lib.cfg {
-        Some(ref cfg) => rustc_attr::cfg_matches(cfg, sess, CRATE_NODE_ID, None),
+        Some(ref cfg) => rustc_attr_parsing::cfg_matches(cfg, sess, CRATE_NODE_ID, None),
         None => true,
     }
 }

rust-toolchain.toml

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