target enum: fixup cargo gpu

Author: Firestar99

Cargo.lock

@@ -13,7 +13,7 @@ exclude = [
 resolver = "2"
 
 [workspace.dependencies]
-spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "3df836eb9d7b01344f52737bf9a310d1fb5a0c26", default-features = false }
+spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "24551164a2b80dfd2e8a8a3e2ec2d367d86a1abe", default-features = false }
 anyhow = "1.0.98"
 clap = { version = "4.5.41", features = ["derive"] }
 crossterm = "0.29.0"

Cargo.toml

@@ -6,7 +6,7 @@ use crate::spirv_source::{
 use crate::target_specs::update_target_specs_files;
 use crate::{cache_dir, spirv_source::SpirvSource};
 use anyhow::Context as _;
-use spirv_builder::SpirvBuilder;
+use spirv_builder::{IntoSpirvTarget, SpirvBuilder};
 use std::path::{Path, PathBuf};
 
 /// Represents a functional backend installation, whether it was cached or just installed.
@@ -32,7 +32,7 @@ impl InstalledBackend {
     pub fn to_spirv_builder(
         &self,
         path_to_crate: impl AsRef<Path>,
-        target: impl Into<String>,
+        target: impl IntoSpirvTarget,
     ) -> SpirvBuilder {
         let mut builder = SpirvBuilder::new(path_to_crate, target);
         self.configure_spirv_builder(&mut builder)
@@ -48,10 +48,12 @@ impl InstalledBackend {
     pub fn configure_spirv_builder(&self, builder: &mut SpirvBuilder) -> anyhow::Result<()> {
         builder.rustc_codegen_spirv_location = Some(self.rustc_codegen_spirv_location.clone());
         builder.toolchain_overwrite = Some(self.toolchain_channel.clone());
-        builder.path_to_target_spec = Some(self.target_spec_dir.join(format!(
-            "{}.json",
-            builder.target.as_ref().context("expect target to be set")?
-        )));
+        let file_name = builder
+            .target
+            .clone()
+            .context("expect target to be set")??
+            .target_json_file_name();
+        builder.path_to_target_spec = Some(self.target_spec_dir.join(file_name));
         Ok(())
     }
 }