From 8f4aaba49e8857174c031db02e006617e2c51c7c Mon Sep 17 00:00:00 2001 From: firestar99 Date: Wed, 7 Oct 2026 15:17:28 +0200 Subject: [PATCH] update to nightly-2026-10-07 --- crates/rustc_codegen_spirv/build.rs | 4 ++-- .../rustc_codegen_spirv/src/builder/format_args_decompiler.rs | 2 +- crates/rustc_codegen_spirv/src/builder/intrinsics.rs | 4 ++-- crates/rustc_codegen_spirv/src/linker/test.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 d63b6dbfeef..363447feb85 100644 --- a/crates/rustc_codegen_spirv/build.rs +++ b/crates/rustc_codegen_spirv/build.rs @@ -19,9 +19,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-2026-09-25" +channel = "nightly-2026-10-07" components = ["rust-src", "rustc-dev", "llvm-tools"] -# commit_hash = f7575a9da8e4a4fca3b5668d5a2ea7476db44b3f"#; +# commit_hash = 8d1a76430406c877b35d0b627e7f796dcf0dfeca"#; fn rustc_output(arg: &str) -> Result> { let rustc = env::var("RUSTC").unwrap_or_else(|_| "rustc".into()); diff --git a/crates/rustc_codegen_spirv/src/builder/format_args_decompiler.rs b/crates/rustc_codegen_spirv/src/builder/format_args_decompiler.rs index dbf2fc90e94..ba408e3745d 100644 --- a/crates/rustc_codegen_spirv/src/builder/format_args_decompiler.rs +++ b/crates/rustc_codegen_spirv/src/builder/format_args_decompiler.rs @@ -1281,7 +1281,7 @@ impl<'a, 'tcx> CodegenPanic<'a, 'tcx> for FormatArgsResult<'tcx> { let force_warn = |span, msg| -> rustc_errors::Diag<'_> { rustc_errors::Diag::new( builder.tcx.dcx(), - rustc_errors::Level::ForceWarning, + rustc_errors::Level::Warning(None), msg, ) .with_span(span) diff --git a/crates/rustc_codegen_spirv/src/builder/intrinsics.rs b/crates/rustc_codegen_spirv/src/builder/intrinsics.rs index e0dfc68be90..805b528728f 100644 --- a/crates/rustc_codegen_spirv/src/builder/intrinsics.rs +++ b/crates/rustc_codegen_spirv/src/builder/intrinsics.rs @@ -100,7 +100,7 @@ impl<'a, 'tcx> IntrinsicCallBuilderMethods<'tcx> for Builder<'a, 'tcx> { } sym::breakpoint => { - self.abort(); + self.abort_immediate(); assert!(result.layout.ty.is_unit()); return IntrinsicResult::WroteIntoPlace; } @@ -376,7 +376,7 @@ impl<'a, 'tcx> IntrinsicCallBuilderMethods<'tcx> for Builder<'a, 'tcx> { bug!("LLVM intrinsic call not supported in SPIR-V backend: {instance:?}") } - fn abort(&mut self) { + fn abort_immediate(&mut self) { self.abort_with_kind_and_message_debug_printf("abort", "intrinsics::abort() called", []); } diff --git a/crates/rustc_codegen_spirv/src/linker/test.rs b/crates/rustc_codegen_spirv/src/linker/test.rs index f82544d68ea..93f88099664 100644 --- a/crates/rustc_codegen_spirv/src/linker/test.rs +++ b/crates/rustc_codegen_spirv/src/linker/test.rs @@ -116,7 +116,7 @@ fn link_with_linker_opts( unreachable!("failed to parse test rustc args") } }; - let sopts = rustc_session::config::build_session_options(&mut early_dcx, &matches); + let sopts = rustc_session::config::build_session_options(&mut early_dcx, &matches, false); let target = SpirvTarget::UNIVERSAL_1_0.rustc_target(); let sm_inputs = rustc_span::source_map::SourceMapInputs { diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 67a02066052..be2ec06b230 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,7 +1,7 @@ [toolchain] -channel = "nightly-2026-09-25" +channel = "nightly-2026-10-07" components = ["rust-src", "rustc-dev", "llvm-tools"] -# commit_hash = f7575a9da8e4a4fca3b5668d5a2ea7476db44b3f +# commit_hash = 8d1a76430406c877b35d0b627e7f796dcf0dfeca # Whenever changing the nightly channel, update the commit hash above, and # change `REQUIRED_RUST_TOOLCHAIN` in `crates/rustc_codegen_spirv/build.rs` too.