From 8051c24e630c82b7b3d6e30819ec7aa9147d4422 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@vectorware.com>
Date: Tue, 30 Sep 2025 13:59:42 +1000
Subject: [PATCH] Update to `nightly-2025-07-07`.

- We now get warnings about unnecessary parentheses around `dyn` types.
- Spelling of `sf.name.prefer_remapped_unconditionaly` was fixed (now
  ends in `lly`).
- `Pointer::into_parts` has been replaced with
  `Pointer::prov_and_relative_offset`.
---
 crates/rustc_codegen_spirv/build.rs                   | 4 ++--
 crates/rustc_codegen_spirv/src/builder_spirv.rs       | 2 +-
 crates/rustc_codegen_spirv/src/codegen_cx/constant.rs | 4 ++--
 crates/rustc_codegen_spirv/src/lib.rs                 | 2 +-
 rust-toolchain.toml                                   | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/crates/rustc_codegen_spirv/build.rs b/crates/rustc_codegen_spirv/build.rs
index 624be5ecf3..2f92b4f9eb 100644
--- a/crates/rustc_codegen_spirv/build.rs
+++ b/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-06-30"
+channel = "nightly-2025-07-07"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = 35f6036521777bdc0dcea1f980be4c192962a168"#;
+# commit_hash = a84ab0ce6c4557a2f01a3a6c3fdb0f92098db78d"#;
 
 fn rustc_output(arg: &str) -> Result<String, Box<dyn Error>> {
     let rustc = env::var("RUSTC").unwrap_or_else(|_| "rustc".into());
diff --git a/crates/rustc_codegen_spirv/src/builder_spirv.rs b/crates/rustc_codegen_spirv/src/builder_spirv.rs
index e05b433057..ba8e01fd44 100644
--- a/crates/rustc_codegen_spirv/src/builder_spirv.rs
+++ b/crates/rustc_codegen_spirv/src/builder_spirv.rs
@@ -887,7 +887,7 @@ impl<'tcx> BuilderSpirv<'tcx> {
                     FileName::Real(name) => {
                         name.to_string_lossy(FileNameDisplayPreference::Remapped)
                     }
-                    _ => sf.name.prefer_remapped_unconditionaly().to_string().into(),
+                    _ => sf.name.prefer_remapped_unconditionally().to_string().into(),
                 };
                 let file_name = {
                     // FIXME(eddyb) it should be possible to arena-allocate a
diff --git a/crates/rustc_codegen_spirv/src/codegen_cx/constant.rs b/crates/rustc_codegen_spirv/src/codegen_cx/constant.rs
index eb8783049c..e688831be2 100644
--- a/crates/rustc_codegen_spirv/src/codegen_cx/constant.rs
+++ b/crates/rustc_codegen_spirv/src/codegen_cx/constant.rs
@@ -244,7 +244,7 @@ impl ConstCodegenMethods for CodegenCx<'_> {
                 }
             }
             Scalar::Ptr(ptr, _) => {
-                let (prov, offset) = ptr.into_parts();
+                let (prov, offset) = ptr.prov_and_relative_offset();
                 let alloc_id = prov.alloc_id();
                 let (base_addr, _base_addr_space) = match self.tcx.global_alloc(alloc_id) {
                     GlobalAlloc::Memory(alloc) => {
@@ -447,7 +447,7 @@ impl<'tcx> CodegenCx<'tcx> {
                         .inner()
                         .read_scalar(self, range, /* read_provenance */ true)
                 {
-                    let (prov, _offset) = ptr.into_parts();
+                    let (prov, _offset) = ptr.prov_and_relative_offset();
                     primitive = Primitive::Pointer(
                         self.tcx.global_alloc(prov.alloc_id()).address_space(self),
                     );
diff --git a/crates/rustc_codegen_spirv/src/lib.rs b/crates/rustc_codegen_spirv/src/lib.rs
index 3e57d8648d..27064c47ae 100644
--- a/crates/rustc_codegen_spirv/src/lib.rs
+++ b/crates/rustc_codegen_spirv/src/lib.rs
@@ -547,7 +547,7 @@ impl ExtraBackendMethods for SpirvCodegenBackend {
         _sess: &Session,
         _opt_level: config::OptLevel,
         _target_features: &[String],
-    ) -> Arc<(dyn Fn(TargetMachineFactoryConfig) -> Result<(), String> + Send + Sync + 'static)>
+    ) -> Arc<dyn Fn(TargetMachineFactoryConfig) -> Result<(), String> + Send + Sync + 'static>
     {
         Arc::new(|_| Ok(()))
     }
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 06deb6d52d..0e0847c587 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,7 +1,7 @@
 [toolchain]
-channel = "nightly-2025-06-30"
+channel = "nightly-2025-07-07"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = 35f6036521777bdc0dcea1f980be4c192962a168
+# commit_hash = a84ab0ce6c4557a2f01a3a6c3fdb0f92098db78d
 
 # Whenever changing the nightly channel, update the commit hash above, and
 # change `REQUIRED_RUST_TOOLCHAIN` in `crates/rustc_codegen_spirv/build.rs` too.