Skip to content

Commit 8051c24

Browse files
committed
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`.
1 parent 50a8507 commit 8051c24

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

crates/rustc_codegen_spirv/build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ use std::{env, fs, mem};
1818
/// `cargo publish`. We need to figure out a way to do this properly, but let's hardcode it for now :/
1919
//const REQUIRED_RUST_TOOLCHAIN: &str = include_str!("../../rust-toolchain.toml");
2020
const REQUIRED_RUST_TOOLCHAIN: &str = r#"[toolchain]
21-
channel = "nightly-2025-06-30"
21+
channel = "nightly-2025-07-07"
2222
components = ["rust-src", "rustc-dev", "llvm-tools"]
23-
# commit_hash = 35f6036521777bdc0dcea1f980be4c192962a168"#;
23+
# commit_hash = a84ab0ce6c4557a2f01a3a6c3fdb0f92098db78d"#;
2424

2525
fn rustc_output(arg: &str) -> Result<String, Box<dyn Error>> {
2626
let rustc = env::var("RUSTC").unwrap_or_else(|_| "rustc".into());

crates/rustc_codegen_spirv/src/builder_spirv.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ impl<'tcx> BuilderSpirv<'tcx> {
887887
FileName::Real(name) => {
888888
name.to_string_lossy(FileNameDisplayPreference::Remapped)
889889
}
890-
_ => sf.name.prefer_remapped_unconditionaly().to_string().into(),
890+
_ => sf.name.prefer_remapped_unconditionally().to_string().into(),
891891
};
892892
let file_name = {
893893
// FIXME(eddyb) it should be possible to arena-allocate a

crates/rustc_codegen_spirv/src/codegen_cx/constant.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ impl ConstCodegenMethods for CodegenCx<'_> {
244244
}
245245
}
246246
Scalar::Ptr(ptr, _) => {
247-
let (prov, offset) = ptr.into_parts();
247+
let (prov, offset) = ptr.prov_and_relative_offset();
248248
let alloc_id = prov.alloc_id();
249249
let (base_addr, _base_addr_space) = match self.tcx.global_alloc(alloc_id) {
250250
GlobalAlloc::Memory(alloc) => {
@@ -447,7 +447,7 @@ impl<'tcx> CodegenCx<'tcx> {
447447
.inner()
448448
.read_scalar(self, range, /* read_provenance */ true)
449449
{
450-
let (prov, _offset) = ptr.into_parts();
450+
let (prov, _offset) = ptr.prov_and_relative_offset();
451451
primitive = Primitive::Pointer(
452452
self.tcx.global_alloc(prov.alloc_id()).address_space(self),
453453
);

crates/rustc_codegen_spirv/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ impl ExtraBackendMethods for SpirvCodegenBackend {
547547
_sess: &Session,
548548
_opt_level: config::OptLevel,
549549
_target_features: &[String],
550-
) -> Arc<(dyn Fn(TargetMachineFactoryConfig) -> Result<(), String> + Send + Sync + 'static)>
550+
) -> Arc<dyn Fn(TargetMachineFactoryConfig) -> Result<(), String> + Send + Sync + 'static>
551551
{
552552
Arc::new(|_| Ok(()))
553553
}

rust-toolchain.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[toolchain]
2-
channel = "nightly-2025-06-30"
2+
channel = "nightly-2025-07-07"
33
components = ["rust-src", "rustc-dev", "llvm-tools"]
4-
# commit_hash = 35f6036521777bdc0dcea1f980be4c192962a168
4+
# commit_hash = a84ab0ce6c4557a2f01a3a6c3fdb0f92098db78d
55

66
# Whenever changing the nightly channel, update the commit hash above, and
77
# change `REQUIRED_RUST_TOOLCHAIN` in `crates/rustc_codegen_spirv/build.rs` too.

0 commit comments

Comments
 (0)