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

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

@@ -5,11 +5,10 @@
 use crate::codegen_cx::CodegenCx;
 use crate::symbols::Symbols;
 use rspirv::spirv::{BuiltIn, ExecutionMode, ExecutionModel, StorageClass};
-use rustc_ast::Attribute;
 use rustc_hir as hir;
 use rustc_hir::def_id::LocalModDefId;
 use rustc_hir::intravisit::{self, Visitor};
-use rustc_hir::{CRATE_HIR_ID, HirId, MethodKind, Target};
+use rustc_hir::{Attribute, CRATE_HIR_ID, HirId, MethodKind, Target};
 use rustc_middle::hir::nested_filter;
 use rustc_middle::query::Providers;
 use rustc_middle::ty::TyCtxt;

crates/rustc_codegen_spirv/src/symbols.rs

@@ -1,8 +1,9 @@
 use crate::attr::{Entry, ExecutionModeExtra, IntrinsicType, SpecConstant, SpirvAttribute};
 use crate::builder::libm_intrinsics;
 use rspirv::spirv::{BuiltIn, ExecutionMode, ExecutionModel, StorageClass};
-use rustc_ast::ast::{AttrKind, Attribute, LitIntType, LitKind, MetaItemInner, MetaItemLit};
+use rustc_ast::ast::{LitIntType, LitKind, MetaItemInner, MetaItemLit};
 use rustc_data_structures::fx::FxHashMap;
+use rustc_hir::{AttrKind, Attribute};
 use rustc_span::Span;
 use rustc_span::symbol::{Ident, Symbol};
 use std::rc::Rc;
@@ -442,12 +443,12 @@ pub(crate) fn parse_attrs_for_checking<'a>(
 ) -> impl Iterator<Item = Result<(Span, SpirvAttribute), ParseAttrError>> + 'a {
     attrs.iter().flat_map(move |attr| {
         let (whole_attr_error, args) = match attr.kind {
-            AttrKind::Normal(ref normal) => {
+            AttrKind::Normal(ref item) => {
                 // #[...]
-                let s = &normal.item.path.segments;
-                if s.len() > 1 && s[0].ident.name == sym.rust_gpu {
+                let s = &item.path.segments;
+                if s.len() > 1 && s[0].name == sym.rust_gpu {
                     // #[rust_gpu ...]
-                    if s.len() != 2 || s[1].ident.name != sym.spirv {
+                    if s.len() != 2 || s[1].name != sym.spirv {
                         // #[rust_gpu::...] but not #[rust_gpu::spirv]
                         (
                             Some(Err((

rust-toolchain.toml

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