Small fixes

Author: tuguzT

Cargo.lock

@@ -9,7 +9,7 @@ members = [
 exclude = [
 	# This currently needs to be excluded because it depends on a version of `rust-gpu` that
 	# uses a toolchain whose Cargo version doesn't recognise version 4 of `Cargo.lock`.
-	"crates/shader-crate-template"
+	"crates/shader-crate-template",
 ]
 
 resolver = "2"
@@ -38,7 +38,6 @@ tempfile = "3.22"
 test-log = "0.2.18"
 cargo_metadata = "0.21.0"
 cargo-util-schemas = "0.8.2"
-semver = "1.0.26"
 dunce = "1.0.5"
 
 # This crate MUST NEVER be upgraded, we need this particular "first" version to support old rust-gpu builds

Cargo.toml

@@ -11,7 +11,6 @@ license.workspace = true
 rustc_codegen_spirv-cache = { path = "../rustc_codegen_spirv-cache" }
 dunce.workspace = true
 thiserror.workspace = true
-semver.workspace = true
 log.workspace = true
 
 [features]

crates/cargo-gpu-build/Cargo.toml

@@ -12,8 +12,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use rustc_codegen_spirv_cache::spirv_builder::query_rustc_version;
-use semver::Version;
+use crate::spirv_cache::{cargo_metadata::semver::Version, spirv_builder::query_rustc_version};
 
 /// `Cargo.lock` manifest version 4 became the default in Rust 1.83.0. Conflicting manifest
 /// versions between the workspace and the shader crate, can cause problems.

crates/cargo-gpu-build/src/lockfile.rs

@@ -12,7 +12,6 @@ default-run = "cargo-gpu"
 [dependencies]
 cargo-gpu-build = { path = "../cargo-gpu-build", features = ["clap", "watch"] }
 spirv-builder = { workspace = true, features = ["clap", "watch"] }
-cargo_metadata.workspace = true
 anyhow.workspace = true
 thiserror.workspace = true
 clap.workspace = true

crates/cargo-gpu/Cargo.toml

@@ -20,7 +20,7 @@
 
 #![expect(clippy::pub_use, reason = "part of public API")]
 
-pub use cargo_gpu_build::spirv_cache;
+pub use cargo_gpu_build::{spirv_builder, spirv_cache};
 
 pub use self::spirv_cache::backend::Install;
 
@@ -64,6 +64,7 @@ pub enum Command {
     /// A hidden command that can be used to recursively print out all the subcommand help messages:
     ///   `cargo gpu dump-usage`
     /// Useful for updating the README.
+    #[doc(hidden)]
     #[clap(hide(true))]
     DumpUsage,
 }

crates/cargo-gpu/src/lib.rs

@@ -1,6 +1,6 @@
 //! Get config from the shader crate's `Cargo.toml` `[*.metadata.rust-gpu.*]`
 
-use cargo_metadata::MetadataCommand;
+use cargo_gpu_build::spirv_cache::cargo_metadata::{self, MetadataCommand};
 use serde_json::Value;
 
 /// `Metadata` refers to the `[metadata.*]` section of `Cargo.toml` that `cargo` formally

crates/cargo-gpu/src/metadata.rs

@@ -23,7 +23,7 @@ pub fn ask_for_user_consent(
 > {
     let on_toolchain_install = move |channel: &str| {
         let message = format!("Rust {channel} with `rustup`");
-        get_consent_for_toolchain_install(format!("Install {message}").as_ref(), skip)?;
+        get_user_consent(format!("Install {message}"), skip)?;
         log::debug!("installing toolchain {channel}");
         user_output!(io::stdout(), "Installing {message}\n").map_err(UserConsentError::IoWrite)?;
         Ok(())
@@ -32,7 +32,7 @@ pub fn ask_for_user_consent(
         let message = format!(
             "components {REQUIRED_TOOLCHAIN_COMPONENTS:?} for toolchain {channel} with `rustup`"
         );
-        get_consent_for_toolchain_install(format!("Install {message}").as_ref(), skip)?;
+        get_user_consent(format!("Install {message}"), skip)?;
         log::debug!("installing required components of toolchain {channel}");
         user_output!(io::stdout(), "Installing {message}\n").map_err(UserConsentError::IoWrite)?;
         Ok(())
@@ -44,8 +44,8 @@ pub fn ask_for_user_consent(
     }
 }
 
-/// Prompt user if they want to install a new Rust toolchain.
-fn get_consent_for_toolchain_install(prompt: &str, skip: bool) -> Result<(), UserConsentError> {
+/// Prompt user if they want to install a new Rust toolchain or its components.
+fn get_user_consent(prompt: impl AsRef<str>, skip: bool) -> Result<(), UserConsentError> {
     if skip {
         return Ok(());
     }
@@ -57,7 +57,7 @@ fn get_consent_for_toolchain_install(prompt: &str, skip: bool) -> Result<(), Use
 
     log::debug!("asking for consent to install the required toolchain");
     crossterm::terminal::enable_raw_mode().map_err(UserConsentError::IoRead)?;
-    user_output!(io::stdout(), "{prompt} [y/n]: ").map_err(UserConsentError::IoWrite)?;
+    user_output!(io::stdout(), "{} [y/n]: ", prompt.as_ref()).map_err(UserConsentError::IoWrite)?;
     let mut input = crossterm::event::read().map_err(UserConsentError::IoRead)?;
 
     if let crossterm::event::Event::Key(crossterm::event::KeyEvent {

crates/cargo-gpu/src/user_consent.rs

@@ -19,12 +19,11 @@ use std::{
     process::Stdio,
 };
 
-use spirv_builder::{cargo_cmd::CargoCmd, SpirvBuilder, SpirvBuilderError};
-
 use crate::{
     cache::{cache_dir, CacheDirError},
     command::{execute_command, CommandExecError},
     metadata::{query_metadata, MetadataExt as _, MissingPackageError, QueryMetadataError},
+    spirv_builder::{cargo_cmd::CargoCmd, SpirvBuilder, SpirvBuilderError},
     spirv_source::{
         rust_gpu_toolchain_channel, RustGpuToolchainChannelError, SpirvSource, SpirvSourceError,
     },
@@ -201,28 +200,7 @@ impl Install {
         fs::File::create(src.join("lib.rs")).map_err(InstallError::CreateDummyLibRs)?;
 
         log::trace!("writing dummy Cargo.toml");
-
-        /// Contents of the `Cargo.toml` file for the local `rustc_codegen_spirv_dummy` crate.
-        #[expect(clippy::items_after_statements, reason = "local constant")]
-        const DUMMY_CARGO_TOML: &str = include_str!("dummy/Cargo.toml");
-
-        let version_spec = match &source {
-            SpirvSource::CratesIO(version) => format!("version = \"{version}\""),
-            SpirvSource::Git { url, rev } => format!("git = \"{url}\"\nrev = \"{rev}\""),
-            SpirvSource::Path {
-                rust_gpu_repo_root,
-                version,
-            } => {
-                // this branch is currently unreachable, as we just build `rustc_codegen_spirv` directly,
-                // since we don't need the `dummy` crate to make cargo download it for us
-                let mut new_path = rust_gpu_repo_root.to_owned();
-                new_path.push("crates/spirv-builder");
-                format!("path = \"{new_path}\"\nversion = \"{version}\"")
-            }
-        };
-
-        let cargo_toml = format!("{DUMMY_CARGO_TOML}{version_spec}\n");
-        fs::write(checkout.join("Cargo.toml"), cargo_toml)
+        fs::write(checkout.join("Cargo.toml"), dummy_cargo_toml(source))
             .map_err(InstallError::WriteDummyCargoToml)?;
 
         Ok(())
@@ -411,7 +389,7 @@ impl<W, T, C, O, E> InstallRunParams<W, T, C, O, E> {
 }
 
 /// [`Default`] parameters for [`Install::run()`].
-type DefaultInstallRunParams = InstallRunParams<
+pub type DefaultInstallRunParams = InstallRunParams<
     io::Empty,
     NoopOnToolchainInstall,
     NoopOnComponentsInstall,
@@ -439,6 +417,28 @@ fn dylib_filename(name: impl AsRef<str>) -> String {
     format!("{DLL_PREFIX}{str_name}{DLL_SUFFIX}")
 }
 
+/// Contents of the `Cargo.toml` file for the local `rustc_codegen_spirv_dummy` crate
+/// without the version specification of the `rustc_codegen_spirv` dependency.
+const DUMMY_CARGO_TOML_NO_VERSION_SPEC: &str = include_str!("dummy/Cargo.toml");
+
+/// Returns the contents of the `Cargo.toml` file for the local `rustc_codegen_spirv_dummy` crate.
+fn dummy_cargo_toml(source: &SpirvSource) -> String {
+    let version_spec = match source {
+        SpirvSource::CratesIO(version) => format!("version = \"{version}\""),
+        SpirvSource::Git { url, rev } => format!("git = \"{url}\"\nrev = \"{rev}\""),
+        SpirvSource::Path {
+            rust_gpu_repo_root,
+            version,
+        } => {
+            // this branch is currently unreachable, as we just build `rustc_codegen_spirv` directly,
+            // since we don't need the `dummy` crate to make cargo download it for us
+            let new_path = rust_gpu_repo_root.join("crates").join("spirv-builder");
+            format!("path = \"{new_path}\"\nversion = \"{version}\"")
+        }
+    };
+    format!("{DUMMY_CARGO_TOML_NO_VERSION_SPEC}{version_spec}\n")
+}
+
 /// An error indicating codegen `rustc_codegen_spirv` installation failure.
 #[derive(Debug, thiserror::Error)]
 #[non_exhaustive]