apply suggestions from @tombh

Author: Firestar99

crates/cargo-gpu/src/args.rs

@@ -1,4 +1,4 @@
-//! Args for building and installing. Previously in `spirv-tools-cli` but got moved here.
+//! Args for building and installing.
 
 use spirv_builder::SpirvBuilder;
 
@@ -63,7 +63,7 @@ pub struct InstallArgs {
     #[clap(long, verbatim_doc_comment)]
     pub spirv_builder_version: Option<String>,
 
-    /// Force `spirv-builder-cli` and `rustc_codegen_spirv` to be rebuilt.
+    /// Force `rustc_codegen_spirv` to be rebuilt.
     #[clap(long)]
     pub force_spirv_cli_rebuild: bool,
 

crates/cargo-gpu/src/linkage.rs

@@ -1,4 +1,4 @@
-//! Mainly for the Linkage struct, which is written to a json file. Previously in `spirv-tools-cli` but got moved here.
+//! Mainly for the Linkage struct, which is written to a json file.
 
 /// Shader source and entry point that can be used to create shader linkage.
 #[derive(serde::Serialize, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]

crates/cargo-gpu/src/lockfile.rs

@@ -1,5 +1,6 @@
-//! Query the shader crate to find what version of `rust-gpu` it depends on.
-//! Then ensure that the relevant Rust toolchain and components are installed.
+//! Handles lockfile version conflicts and downgrades. Stable uses lockfile v4, but rust-gpu
+//! v0.9.0 uses an old toolchain requiring v3 and will refuse to build with a v4 lockfile being
+//! present. This module takes care of warning the user and potentially downgrading the lockfile.
 
 use anyhow::Context as _;
 use semver::Version;

crates/cargo-gpu/src/metadata.rs

@@ -32,7 +32,7 @@ impl Metadata {
             &mut metadata,
             {
                 log::debug!("looking for workspace metadata");
-                let ws_meta = Self::get_workspace_metadata(cargo_json);
+                let ws_meta = Self::get_rust_gpu_from_metadata(&cargo_json.workspace_metadata);
                 log::trace!("workspace_metadata: {ws_meta:#?}");
                 ws_meta
             },
@@ -64,19 +64,12 @@ impl Metadata {
     }
 
     /// Convert a `Cargo.toml` to JSON
-    //
-    // TODO: reuse for getting the default `rust-gpu` source and toolchain.
     fn get_cargo_toml_as_json(
         path: &std::path::PathBuf,
     ) -> anyhow::Result<cargo_metadata::Metadata> {
         Ok(MetadataCommand::new().current_dir(path).exec()?)
     }
 
-    /// Get any `rust-gpu` metadata set in the root workspace `Cargo.toml`
-    fn get_workspace_metadata(metadata: &cargo_metadata::Metadata) -> Value {
-        Self::get_rust_gpu_from_metadata(&metadata.workspace_metadata)
-    }
-
     /// Get any `rust-gpu` metadata set in the crate's `Cargo.toml`
     fn get_crate_metadata(
         json: &cargo_metadata::Metadata,