From 31153a8edd3bc626d4b9fb0cd7bdb7a8b30797d3 Mon Sep 17 00:00:00 2001 From: Schell Carl Scivally Date: Sat, 20 Sep 2025 15:48:11 +1200 Subject: [PATCH 1/2] fix: ensure toolchain components are installed, even if artifacts exist --- crates/cargo-gpu/src/install.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/crates/cargo-gpu/src/install.rs b/crates/cargo-gpu/src/install.rs index 95ff906..aa3dfa1 100644 --- a/crates/cargo-gpu/src/install.rs +++ b/crates/cargo-gpu/src/install.rs @@ -264,14 +264,14 @@ package = "rustc_codegen_spirv" let target_spec_dir = update_target_specs_files(&source, &dummy_metadata, !skip_rebuild) .context("writing target spec files")?; - if !skip_rebuild { - log::debug!("ensure_toolchain_and_components_exist"); - crate::install_toolchain::ensure_toolchain_and_components_exist( - &toolchain_channel, - self.auto_install_rust_toolchain, - ) - .context("ensuring toolchain and components exist")?; + log::debug!("ensure_toolchain_and_components_exist"); + crate::install_toolchain::ensure_toolchain_and_components_exist( + &toolchain_channel, + self.auto_install_rust_toolchain, + ) + .context("ensuring toolchain and components exist")?; + if !skip_rebuild { // to prevent unsupported version errors when using older toolchains if !source.is_path() { log::debug!("remove Cargo.lock"); From 87c8bcd59cbbdbe96cb6e38e4a11a1f7c77b6cad Mon Sep 17 00:00:00 2001 From: Schell Carl Scivally Date: Sat, 20 Sep 2025 15:58:33 +1200 Subject: [PATCH 2/2] clippy fixes --- crates/cargo-gpu/src/lib.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/crates/cargo-gpu/src/lib.rs b/crates/cargo-gpu/src/lib.rs index 323743b..1be7abb 100644 --- a/crates/cargo-gpu/src/lib.rs +++ b/crates/cargo-gpu/src/lib.rs @@ -145,10 +145,8 @@ impl Command { command.build.watch = false; command.run()?; command.build.watch = true; - command.run()?; - } else { - command.run()?; } + command.run()?; } Self::Show(show) => show.run()?, Self::DumpUsage => dump_full_usage_for_readme()?,