Skip to content

Commit bbf35b0

Browse files
committed
rustup: update to nightly-2025-06-30.
- `filter_landing_pad` no longer has a return value. - `build_session` no longer has the `sysroot` argument.
1 parent dfcff49 commit bbf35b0

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
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-23"
21+
channel = "nightly-2025-06-30"
2222
components = ["rust-src", "rustc-dev", "llvm-tools"]
23-
# commit_hash = be19eda0dc4c22c5cf5f1b48fd163acf9bd4b0a6"#;
23+
# commit_hash = 35f6036521777bdc0dcea1f980be4c192962a168"#;
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/builder_methods.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3035,7 +3035,7 @@ impl<'a, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'tcx> {
30353035
todo!()
30363036
}
30373037

3038-
fn filter_landing_pad(&mut self, _pers_fn: Self::Function) -> (Self::Value, Self::Value) {
3038+
fn filter_landing_pad(&mut self, _pers_fn: Self::Function) {
30393039
todo!()
30403040
}
30413041

crates/rustc_codegen_spirv/src/linker/test.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ fn link_with_linker_opts(
159159
Default::default(),
160160
Default::default(),
161161
target,
162-
Default::default(),
163162
rustc_interface::util::rustc_version_str().unwrap_or("unknown"),
164163
Default::default(),
165164
&rustc_driver_impl::USING_INTERNAL_FEATURES,

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-23"
2+
channel = "nightly-2025-06-30"
33
components = ["rust-src", "rustc-dev", "llvm-tools"]
4-
# commit_hash = be19eda0dc4c22c5cf5f1b48fd163acf9bd4b0a6
4+
# commit_hash = 35f6036521777bdc0dcea1f980be4c192962a168
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)