Decouple SpirvSource, add error types for it

Author: tuguzT

Cargo.lock

@@ -1,6 +1,7 @@
 [workspace]
 members = [
 	"crates/rustc_codegen_spirv-cache",
+	"crates/cargo-gpu-test-utils",
 	"crates/cargo-gpu-cache",
 	"crates/cargo-gpu",
 	"crates/xtask",
@@ -24,6 +25,7 @@ license = "MIT OR Apache-2.0"
 [workspace.dependencies]
 spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "3df836eb9d7b01344f52737bf9a310d1fb5a0c26", default-features = false }
 anyhow = "1.0.98"
+thiserror = "2.0.12"
 clap = { version = "4.5.41", features = ["derive"] }
 crossterm = "0.29.0"
 directories = "6.0.0"

Cargo.toml

@@ -23,8 +23,8 @@ semver.workspace = true
 dunce.workspace = true
 
 [dev-dependencies]
+cargo-gpu-test-utils = { path = "../cargo-gpu-test-utils" }
 test-log.workspace = true
-tempfile.workspace = true
 cargo_metadata = { workspace = true, features = ["builder"] }
 cargo-util-schemas.workspace = true
 

crates/cargo-gpu-cache/Cargo.toml

@@ -204,15 +204,16 @@ impl Build {
 mod test {
     #![cfg(feature = "clap")]
 
+    use cargo_gpu_test_utils::{shader_crate_template_path, tests_teardown};
     use clap::Parser as _;
 
     use crate::{Cli, Command};
 
     #[test_log::test]
     fn builder_from_params() {
-        crate::test::tests_teardown();
+        tests_teardown();
 
-        let shader_crate_path = crate::test::shader_crate_template_path();
+        let shader_crate_path = shader_crate_template_path();
         let output_dir = shader_crate_path.join("shaders");
 
         let args = [

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

@@ -87,13 +87,15 @@ impl Config {
 
 #[cfg(test)]
 mod test {
-    use super::*;
-
     use std::io::Write as _;
 
+    use cargo_gpu_test_utils::{overwrite_shader_cargo_toml, shader_crate_test_path};
+
+    use super::*;
+
     #[test_log::test]
     fn booleans_from_cli() {
-        let shader_crate_path = crate::test::shader_crate_test_path();
+        let shader_crate_path = shader_crate_test_path();
 
         let args = Config::clap_command_with_cargo_config(
             &shader_crate_path,
@@ -111,8 +113,8 @@ mod test {
 
     #[test_log::test]
     fn booleans_from_cargo() {
-        let shader_crate_path = crate::test::shader_crate_test_path();
-        let mut file = crate::test::overwrite_shader_cargo_toml(&shader_crate_path);
+        let shader_crate_path = shader_crate_test_path();
+        let mut file = overwrite_shader_cargo_toml(&shader_crate_path);
         file.write_all(
             [
                 "[package.metadata.rust-gpu.build]",
@@ -131,8 +133,8 @@ mod test {
     }
 
     fn update_cargo_output_dir() -> std::path::PathBuf {
-        let shader_crate_path = crate::test::shader_crate_test_path();
-        let mut file = crate::test::overwrite_shader_cargo_toml(&shader_crate_path);
+        let shader_crate_path = shader_crate_test_path();
+        let mut file = overwrite_shader_cargo_toml(&shader_crate_path);
         file.write_all(
             [
                 "[package.metadata.rust-gpu.build]",
@@ -176,8 +178,8 @@ mod test {
 
     #[test_log::test]
     fn arrays_from_cargo() {
-        let shader_crate_path = crate::test::shader_crate_test_path();
-        let mut file = crate::test::overwrite_shader_cargo_toml(&shader_crate_path);
+        let shader_crate_path = shader_crate_test_path();
+        let mut file = overwrite_shader_cargo_toml(&shader_crate_path);
         file.write_all(
             [
                 "[package.metadata.rust-gpu.build]",
@@ -200,7 +202,7 @@ mod test {
 
     #[test_log::test]
     fn rename_manifest_parse() {
-        let shader_crate_path = crate::test::shader_crate_test_path();
+        let shader_crate_path = shader_crate_test_path();
 
         let args = Config::clap_command_with_cargo_config(
             &shader_crate_path,

crates/cargo-gpu-cache/src/config.rs

@@ -3,13 +3,13 @@
 use std::path::{Path, PathBuf};
 
 use anyhow::Context as _;
-use rustc_codegen_spirv_cache::cache_dir;
+use rustc_codegen_spirv_cache::{
+    cache::cache_dir,
+    metadata::{query_metadata, MetadataExt as _},
+    spirv_source::{get_channel_from_rustc_codegen_spirv_build_script, SpirvSource},
+};
 use spirv_builder::SpirvBuilder;
 
-use crate::spirv_source::SpirvSource;
-use crate::spirv_source::{
-    get_channel_from_rustc_codegen_spirv_build_script, query_metadata, FindPackage as _,
-};
 use crate::target_specs::update_target_specs_files;
 
 /// Represents a functional backend installation, whether it was cached or just installed.

crates/cargo-gpu-cache/src/install.rs

@@ -52,9 +52,7 @@ mod linkage;
 mod lockfile;
 mod metadata;
 mod show;
-mod spirv_source;
 mod target_specs;
-mod test;
 
 pub use install::*;
 pub use spirv_builder;
@@ -162,16 +160,3 @@ pub struct Cli {
     #[cfg_attr(feature = "clap", clap(subcommand))]
     pub command: Command,
 }
-
-/// Returns a string suitable to use as a directory.
-///
-/// Created from the spirv-builder source dep and the rustc channel.
-fn to_dirname(text: &str) -> String {
-    text.replace(
-        [std::path::MAIN_SEPARATOR, '\\', '/', '.', ':', '@', '='],
-        "_",
-    )
-    .split(['{', '}', ' ', '\n', '"', '\''])
-    .collect::<Vec<_>>()
-    .concat()
-}

crates/cargo-gpu-cache/src/lib.rs

@@ -3,13 +3,12 @@
 use std::{fs, path::Path};
 
 use anyhow::bail;
-use rustc_codegen_spirv_cache::cache_dir;
-
-use crate::{
-    spirv_source::{query_metadata, SpirvSource},
-    target_specs::update_target_specs_files,
+use rustc_codegen_spirv_cache::{
+    cache::cache_dir, metadata::query_metadata, spirv_source::SpirvSource,
 };
 
+use crate::target_specs::update_target_specs_files;
+
 /// Show the computed source of the spirv-std dependency.
 #[derive(Clone, Debug)]
 #[cfg_attr(feature = "clap", derive(clap::Parser))]