Update to nightly-2025-08-04.

- `tcx.get_attrs_unchecked(...)` was replaced with
  `tcx.get_all_attrs(...)`.
- `run_link` has been removed.
- `BuilderMethods::tail_call` was added. It's currently `todo!()`.
- Adjust expected test outputs for very minor error message formatting
  changes.
- And update to glam 0.30.8.

Author: nnethercote

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-07-28"
+channel = "nightly-2025-08-04"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = f8e355c230c6eb7b78ffce6a92fd81f78c890524"#;
+# commit_hash = f34ba774c78ea32b7c40598b8ad23e75cdac42a6"#;
 
 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

@@ -286,7 +286,7 @@ impl<'tcx> ConvSpirvType<'tcx> for TyAndLayout<'tcx> {
                 span = cx.tcx.def_span(adt.did());
             }
 
-            let attrs = AggregatedSpirvAttributes::parse(cx, cx.tcx.get_attrs_unchecked(adt.did()));
+            let attrs = AggregatedSpirvAttributes::parse(cx, cx.tcx.get_all_attrs(adt.did()));
 
             if let Some(intrinsic_type_attr) = attrs.intrinsic_type.map(|attr| attr.value)
                 && let Ok(spirv_type) =

crates/rustc_codegen_spirv/src/builder/builder_methods.rs

@@ -4160,6 +4160,19 @@ impl<'a, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'tcx> {
             .with_type(result_type)
     }
 
+    fn tail_call(                                                         
+        &mut self,
+        _llty: Self::Type,
+        _fn_attrs: Option<&CodegenFnAttrs>,
+        _fn_abi: &FnAbi<'tcx, Ty<'tcx>>,
+        _llfn: Self::Value,
+        _args: &[Self::Value],                                            
+        _funclet: Option<&Self::Funclet>,                                 
+        _instance: Option<ty::Instance<'tcx>>,                                
+    ) {                                                                   
+        todo!()
+    }                                                                     
+
     fn zext(&mut self, val: Self::Value, dest_ty: Self::Type) -> Self::Value {
         self.intcast(val, dest_ty, false)
     }

crates/rustc_codegen_spirv/src/codegen_cx/declare.rs

@@ -10,8 +10,8 @@ use crate::spirv_type::SpirvType;
 use itertools::Itertools;
 use rspirv::spirv::{FunctionControl, LinkageType, StorageClass, Word};
 use rustc_abi::Align;
-use rustc_attr_data_structures::InlineAttr;
 use rustc_codegen_ssa::traits::{PreDefineCodegenMethods, StaticCodegenMethods};
+use rustc_hir::attrs::InlineAttr;
 use rustc_middle::bug;
 use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
 use rustc_middle::mir::mono::{Linkage, MonoItem, Visibility};
@@ -133,7 +133,7 @@ impl<'tcx> CodegenCx<'tcx> {
             self.set_linkage(fn_id, symbol_name.to_owned(), linkage);
         }
 
-        let attrs = AggregatedSpirvAttributes::parse(self, self.tcx.get_attrs_unchecked(def_id));
+        let attrs = AggregatedSpirvAttributes::parse(self, self.tcx.get_all_attrs(def_id));
         if let Some(entry) = attrs.entry.map(|attr| attr.value) {
             // HACK(eddyb) early insert to let `shader_entry_stub` call this
             // very function via `get_fn_addr`.
@@ -167,7 +167,7 @@ impl<'tcx> CodegenCx<'tcx> {
         }
 
         // Check if this is a From trait implementation
-        if let Some(impl_def_id) = self.tcx.impl_of_method(def_id)
+        if let Some(impl_def_id) = self.tcx.impl_of_assoc(def_id)
             && let Some(trait_ref) = self.tcx.impl_trait_ref(impl_def_id)
         {
             let trait_def_id = trait_ref.skip_binder().def_id;

crates/rustc_codegen_spirv/src/lib.rs

@@ -332,21 +332,6 @@ impl WriteBackendMethods for SpirvCodegenBackend {
     type ThinData = ();
     type ThinBuffer = SpirvModuleBuffer;
 
-    // FIXME(eddyb) reuse the "merge" stage of `crate::linker` for this, or even
-    // delegate to `run_and_optimize_fat_lto` (although `-Zcombine-cgu` is much more niche).
-    fn run_link(
-        cgcx: &CodegenContext<Self>,
-        diag_handler: DiagCtxtHandle<'_>,
-        _modules: Vec<ModuleCodegen<Self::Module>>,
-    ) -> Result<ModuleCodegen<Self::Module>, FatalError> {
-        assert!(
-            cgcx.opts.unstable_opts.combine_cgu,
-            "`run_link` (for `WorkItemResult::NeedsLink`) should \
-             only be invoked due to `-Zcombine-cgu`"
-        );
-        diag_handler.fatal("Rust-GPU does not support `-Zcombine-cgu`")
-    }
-
     // FIXME(eddyb) reuse the "merge" stage of `crate::linker` for this, or even
     // consider setting `requires_lto = true` in the target specs and moving the
     // entirety of `crate::linker` into this stage (lacking diagnostics may be

rust-toolchain.toml

@@ -1,7 +1,7 @@
 [toolchain]
-channel = "nightly-2025-07-28"
+channel = "nightly-2025-08-04"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = f8e355c230c6eb7b78ffce6a92fd81f78c890524
+# commit_hash = f34ba774c78ea32b7c40598b8ad23e75cdac42a6
 
 # Whenever changing the nightly channel, update the commit hash above, and
 # change `REQUIRED_RUST_TOOLCHAIN` in `crates/rustc_codegen_spirv/build.rs` too.

tests/compiletests/ui/arch/debug_printf_type_checking.stderr

@@ -61,7 +61,7 @@ error: Unrecognised format specifier: 'r'
 error[E0308]: mismatched types
    --> $DIR/debug_printf_type_checking.rs:21:29
     |
-21  |         debug_printf!("%f", 11_u32);
+ 21 |         debug_printf!("%f", 11_u32);
     |         --------------------^^^^^^-
     |         |                   |
     |         |                   expected `f32`, found `u32`
@@ -70,7 +70,7 @@ error[E0308]: mismatched types
 help: the return type of this call is `u32` due to the type of the argument passed
    --> $DIR/debug_printf_type_checking.rs:21:9
     |
-21  |         debug_printf!("%f", 11_u32);
+ 21 |         debug_printf!("%f", 11_u32);
     |         ^^^^^^^^^^^^^^^^^^^^------^
     |                             |
     |                             this argument influences the return type of `debug_printf_assert_is_type`
@@ -82,14 +82,14 @@ note: function defined here
     = note: this error originates in the macro `debug_printf` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: change the type of the numeric literal from `u32` to `f32`
     |
-21  -         debug_printf!("%f", 11_u32);
-21  +         debug_printf!("%f", 11_f32);
+ 21 -         debug_printf!("%f", 11_u32);
+ 21 +         debug_printf!("%f", 11_f32);
     |
 
 error[E0308]: mismatched types
    --> $DIR/debug_printf_type_checking.rs:22:29
     |
-22  |         debug_printf!("%u", 11.0_f32);
+ 22 |         debug_printf!("%u", 11.0_f32);
     |         --------------------^^^^^^^^-
     |         |                   |
     |         |                   expected `u32`, found `f32`
@@ -98,7 +98,7 @@ error[E0308]: mismatched types
 help: the return type of this call is `f32` due to the type of the argument passed
    --> $DIR/debug_printf_type_checking.rs:22:9
     |
-22  |         debug_printf!("%u", 11.0_f32);
+ 22 |         debug_printf!("%u", 11.0_f32);
     |         ^^^^^^^^^^^^^^^^^^^^--------^
     |                             |
     |                             this argument influences the return type of `debug_printf_assert_is_type`
@@ -110,14 +110,14 @@ note: function defined here
     = note: this error originates in the macro `debug_printf` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: change the type of the numeric literal from `f32` to `u32`
     |
-22  -         debug_printf!("%u", 11.0_f32);
-22  +         debug_printf!("%u", 11u32);
+ 22 -         debug_printf!("%u", 11.0_f32);
+ 22 +         debug_printf!("%u", 11u32);
     |
 
 error[E0277]: the trait bound `{float}: Vector<f32, 2>` is not satisfied
    --> $DIR/debug_printf_type_checking.rs:23:9
     |
-23  |         debug_printf!("%v2f", 11.0);
+ 23 |         debug_printf!("%v2f", 11.0);
     |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Vector<f32, 2>` is not implemented for `{float}`
     |
     = help: the following other types implement trait `Vector<T, N>`:
@@ -143,7 +143,7 @@ note: required by a bound in `debug_printf_assert_is_vector`
 error[E0308]: mismatched types
    --> $DIR/debug_printf_type_checking.rs:24:29
     |
-24  |         debug_printf!("%f", Vec2::splat(33.3));
+ 24 |         debug_printf!("%f", Vec2::splat(33.3));
     |         --------------------^^^^^^^^^^^^^^^^^-
     |         |                   |
     |         |                   expected `f32`, found `Vec2`
@@ -152,7 +152,7 @@ error[E0308]: mismatched types
 help: the return type of this call is `Vec2` due to the type of the argument passed
    --> $DIR/debug_printf_type_checking.rs:24:9
     |
-24  |         debug_printf!("%f", Vec2::splat(33.3));
+ 24 |         debug_printf!("%f", Vec2::splat(33.3));
     |         ^^^^^^^^^^^^^^^^^^^^-----------------^
     |                             |
     |                             this argument influences the return type of `debug_printf_assert_is_type`

tests/compiletests/ui/dis/ptr_copy.normal.stderr

@@ -12,17 +12,17 @@ note: used from within `core::ptr::copy::<f32>`
 note: called by `ptr_copy::copy_via_raw_ptr`
    --> $DIR/ptr_copy.rs:28:18
     |
-28  |         unsafe { core::ptr::copy(src, dst, 1) }
+ 28 |         unsafe { core::ptr::copy(src, dst, 1) }
     |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: called by `ptr_copy::main`
    --> $DIR/ptr_copy.rs:33:5
     |
-33  |     copy_via_raw_ptr(&i, o);
+ 33 |     copy_via_raw_ptr(&i, o);
     |     ^^^^^^^^^^^^^^^^^^^^^^^
 note: called by `main`
    --> $DIR/ptr_copy.rs:32:8
     |
-32  | pub fn main(i: f32, o: &mut f32) {
+ 32 | pub fn main(i: f32, o: &mut f32) {
     |        ^^^^
 
 error: cannot cast between pointer types
@@ -51,17 +51,17 @@ note: used from within `core::ptr::copy::<f32>`
 note: called by `ptr_copy::copy_via_raw_ptr`
    --> $DIR/ptr_copy.rs:28:18
     |
-28  |         unsafe { core::ptr::copy(src, dst, 1) }
+ 28 |         unsafe { core::ptr::copy(src, dst, 1) }
     |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: called by `ptr_copy::main`
    --> $DIR/ptr_copy.rs:33:5
     |
-33  |     copy_via_raw_ptr(&i, o);
+ 33 |     copy_via_raw_ptr(&i, o);
     |     ^^^^^^^^^^^^^^^^^^^^^^^
 note: called by `main`
    --> $DIR/ptr_copy.rs:32:8
     |
-32  | pub fn main(i: f32, o: &mut f32) {
+ 32 | pub fn main(i: f32, o: &mut f32) {
     |        ^^^^
 
 error: aborting due to 2 previous errors

tests/compiletests/ui/dis/ptr_read.stderr

@@ -2,7 +2,7 @@
 %4 = OpFunctionParameter  %5
 %6 = OpFunctionParameter  %5
 %7 = OpLabel
-OpLine %8 1737 8
+OpLine %8 1739 8
 %9 = OpLoad  %10  %4
 OpLine %11 7 13
 OpStore %6 %9

tests/compiletests/ui/dis/ptr_read_method.stderr

@@ -2,7 +2,7 @@
 %4 = OpFunctionParameter  %5
 %6 = OpFunctionParameter  %5
 %7 = OpLabel
-OpLine %8 1737 8
+OpLine %8 1739 8
 %9 = OpLoad  %10  %4
 OpLine %11 7 13
 OpStore %6 %9