target enum: change SpirvBuilder::new to accept target as SpirvTargetEnv instead of silently failing to parse

Author: Firestar99

crates/rustc_codegen_spirv-target-specs/src/lib.rs

@@ -109,22 +109,6 @@ impl SpirvTargetEnv {
     }
 }
 
-pub trait IntoSpirvTarget: Sized {
-    fn to_spirv_target_env(&self) -> Result<SpirvTargetEnv, SpirvTargetParseError>;
-}
-
-impl IntoSpirvTarget for SpirvTargetEnv {
-    fn to_spirv_target_env(&self) -> Result<SpirvTargetEnv, SpirvTargetParseError> {
-        Ok(*self)
-    }
-}
-
-impl IntoSpirvTarget for &str {
-    fn to_spirv_target_env(&self) -> Result<SpirvTargetEnv, SpirvTargetParseError> {
-        SpirvTargetEnv::parse_triple(self)
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

crates/spirv-builder/src/lib.rs

@@ -90,9 +90,7 @@ use std::path::{Path, PathBuf};
 use std::process::{Command, Stdio};
 use thiserror::Error;
 
-pub use rustc_codegen_spirv_target_specs::{
-    IntoSpirvTarget, SpirvTargetEnv, SpirvTargetParseError,
-};
+pub use rustc_codegen_spirv_target_specs::{SpirvTargetEnv, SpirvTargetParseError};
 pub use rustc_codegen_spirv_types::*;
 
 #[cfg(feature = "include-target-specs")]
@@ -492,10 +490,10 @@ impl Default for SpirvBuilder {
 }
 
 impl SpirvBuilder {
-    pub fn new(path_to_crate: impl AsRef<Path>, target: impl IntoSpirvTarget) -> Self {
+    pub fn new(path_to_crate: impl AsRef<Path>, target: SpirvTargetEnv) -> Self {
         Self {
             path_to_crate: Some(path_to_crate.as_ref().to_owned()),
-            target: target.to_spirv_target_env().ok(),
+            target: Some(target),
             ..SpirvBuilder::default()
         }
     }

examples/multibuilder/src/main.rs

@@ -1,9 +1,9 @@
-use spirv_builder::{MetadataPrintout, SpirvBuilder};
+use spirv_builder::{MetadataPrintout, SpirvBuilder, SpirvTargetEnv};
 
 fn main() {
     let result = SpirvBuilder::new(
         concat!(env!("CARGO_MANIFEST_DIR"), "/../shaders/sky-shader"),
-        "spirv-unknown-spv1.3",
+        SpirvTargetEnv::Vulkan_1_3,
     )
     .print_metadata(MetadataPrintout::DependencyOnly)
     .multimodule(true)

examples/runners/ash/src/main.rs

@@ -91,7 +91,7 @@ use std::{
 
 use clap::Parser;
 
-use spirv_builder::{MetadataPrintout, SpirvBuilder};
+use spirv_builder::{MetadataPrintout, SpirvBuilder, SpirvTargetEnv};
 
 use shared::ShaderConstants;
 
@@ -247,7 +247,7 @@ pub fn compile_shaders() -> Vec<SpvFile> {
 
     SpirvBuilder::new(
         concat!(env!("CARGO_MANIFEST_DIR"), "/../../shaders/sky-shader"),
-        "spirv-unknown-vulkan1.1",
+        SpirvTargetEnv::Vulkan_1_1,
     )
     .print_metadata(MetadataPrintout::None)
     .shader_panic_strategy(spirv_builder::ShaderPanicStrategy::DebugPrintfThenExit {

examples/runners/wgpu/builder/src/main.rs

@@ -1,4 +1,4 @@
-use spirv_builder::{MetadataPrintout, SpirvBuilder};
+use spirv_builder::{MetadataPrintout, SpirvBuilder, SpirvTargetEnv};
 use std::env;
 use std::error::Error;
 use std::fs;
@@ -7,7 +7,7 @@ use std::path::Path;
 fn build_shader(path_to_crate: &str, codegen_names: bool) -> Result<(), Box<dyn Error>> {
     let builder_dir = &Path::new(env!("CARGO_MANIFEST_DIR"));
     let path_to_crate = builder_dir.join(path_to_crate);
-    let result = SpirvBuilder::new(path_to_crate, "spirv-unknown-vulkan1.1")
+    let result = SpirvBuilder::new(path_to_crate, SpirvTargetEnv::Vulkan_1_1)
         .print_metadata(MetadataPrintout::Full)
         .build()?;
     if codegen_names {

examples/runners/wgpu/src/lib.rs

@@ -73,6 +73,7 @@
 
 use clap::Parser;
 use clap::ValueEnum;
+use spirv_builder::SpirvTargetEnv;
 use std::borrow::Cow;
 use strum::{Display, EnumString};
 
@@ -152,7 +153,7 @@ fn maybe_watch(
 
         let has_debug_printf = options.force_spirv_passthru;
 
-        let builder = SpirvBuilder::new(crate_path, "spirv-unknown-vulkan1.1")
+        let builder = SpirvBuilder::new(crate_path, SpirvTargetEnv::Vulkan_1_1)
             .print_metadata(MetadataPrintout::None)
             .shader_panic_strategy(if has_debug_printf {
                 spirv_builder::ShaderPanicStrategy::DebugPrintfThenExit {

tests/difftests/lib/src/scaffold/compute/wgpu.rs

@@ -2,7 +2,7 @@ use crate::config::Config;
 use anyhow::Context;
 use bytemuck::Pod;
 use futures::executor::block_on;
-use spirv_builder::{ModuleResult, SpirvBuilder};
+use spirv_builder::{ModuleResult, SpirvBuilder, SpirvTargetEnv};
 use std::{
     borrow::Cow,
     env,
@@ -36,7 +36,7 @@ impl ComputeShader for RustComputeShader {
         &self,
         device: &wgpu::Device,
     ) -> anyhow::Result<(wgpu::ShaderModule, Option<String>)> {
-        let builder = SpirvBuilder::new(&self.path, "spirv-unknown-vulkan1.1")
+        let builder = SpirvBuilder::new(&self.path, SpirvTargetEnv::Vulkan_1_2)
             .print_metadata(spirv_builder::MetadataPrintout::None)
             .release(true)
             .multimodule(false)