Move install codegen handling out of CLI

Author: tuguzT

Cargo.lock

@@ -9,7 +9,7 @@ use anyhow::Context as _;
 use rustc_codegen_spirv_cache::user_output;
 use spirv_builder::{CompileResult, ModuleResult, SpirvBuilder};
 
-use crate::{install::Install, linkage::Linkage, lockfile::LockfileMismatchHandler};
+use crate::{linkage::Linkage, lockfile::LockfileMismatchHandler, Install};
 
 /// Args for just a build
 #[derive(clap::Parser, Debug, Clone, serde::Deserialize, serde::Serialize)]

crates/cargo-gpu/src/build.rs

@@ -50,21 +50,18 @@
 //! conduct other post-processing, like converting the `spv` files into `wgsl` files,
 //! for example.
 
-use crate::dump_usage::dump_full_usage_for_readme;
-use build::Build;
-use show::Show;
+use self::{build::Build, dump_usage::dump_full_usage_for_readme, show::Show};
 
 mod build;
 mod config;
 mod dump_usage;
-mod install;
 mod linkage;
 mod lockfile;
 mod metadata;
 mod show;
 mod test;
 
-pub use install::*;
+pub use rustc_codegen_spirv_cache::backend::*;
 pub use spirv_builder;
 
 /// All of the available subcommands for `cargo gpu`

crates/cargo-gpu/src/lib.rs

@@ -8,13 +8,16 @@ keywords.workspace = true
 license.workspace = true
 
 [dependencies]
+spirv-builder.workspace = true
 legacy_target_specs.workspace = true
 thiserror.workspace = true
 anyhow.workspace = true
 log.workspace = true
 directories.workspace = true
 cargo_metadata.workspace = true
 crossterm.workspace = true
+clap.workspace = true
+serde.workspace = true
 
 [dev-dependencies]
 test-log.workspace = true

crates/rustc_codegen_spirv-cache/Cargo.toml

@@ -3,7 +3,9 @@
 use std::path::{Path, PathBuf};
 
 use anyhow::Context as _;
-use rustc_codegen_spirv_cache::{
+use spirv_builder::SpirvBuilder;
+
+use crate::{
     cache::cache_dir,
     spirv_source::{
         get_channel_from_rustc_codegen_spirv_build_script, query_metadata, FindPackage as _,
@@ -12,11 +14,11 @@ use rustc_codegen_spirv_cache::{
     target_specs::update_target_specs_files,
     toolchain, user_output,
 };
-use spirv_builder::SpirvBuilder;
 
 /// Represents a functional backend installation, whether it was cached or just installed.
 #[derive(Clone, Debug, Default)]
 #[non_exhaustive]
+#[expect(clippy::module_name_repetitions, reason = "it's fine")]
 pub struct InstalledBackend {
     /// path to the `rustc_codegen_spirv` dylib
     pub rustc_codegen_spirv_location: PathBuf,
@@ -183,9 +185,6 @@ impl Install {
                     new_path.push("crates/spirv-builder");
                     format!("path = \"{new_path}\"\nversion = \"{version}\"")
                 }
-                // TODO: remove this once this module moves to rustc_codegen_spirv-cache
-                #[expect(clippy::todo, reason = "temporary allow this")]
-                _ => todo!(),
             };
             let cargo_toml = format!(
                 r#"

crates/cargo-gpu/src/install.rs renamed to crates/rustc_codegen_spirv-cache/src/backend.rs

@@ -14,6 +14,7 @@
 // TODO: remove this & fix documentation
 #![expect(clippy::missing_errors_doc, reason = "temporary allow this")]
 
+pub mod backend;
 pub mod cache;
 pub mod spirv_source;
 pub mod target_specs;