target enum: make SpirvBuilder::new return Result

Author: Firestar99

crates/spirv-builder/src/lib.rs

@@ -492,12 +492,15 @@ impl Default for SpirvBuilder {
 }
 
 impl SpirvBuilder {
-    pub fn new(path_to_crate: impl AsRef<Path>, target: impl IntoSpirvTarget) -> Self {
-        Self {
+    pub fn new(
+        path_to_crate: impl AsRef<Path>,
+        target: impl IntoSpirvTarget,
+    ) -> Result<Self, SpirvTargetParseError> {
+        Ok(Self {
             path_to_crate: Some(path_to_crate.as_ref().to_owned()),
-            target: target.to_spirv_target_env().ok(),
+            target: Some(target.to_spirv_target_env()?),
             ..SpirvBuilder::default()
-        }
+        })
     }
 
     /// Sets the path of the "target specification" file.

examples/multibuilder/src/main.rs

@@ -1,13 +1,13 @@
 use spirv_builder::{MetadataPrintout, SpirvBuilder};
 
-fn main() {
+fn main() -> Result<(), Box<dyn std::error::Error>> {
     let result = SpirvBuilder::new(
         concat!(env!("CARGO_MANIFEST_DIR"), "/../shaders/sky-shader"),
         "spirv-unknown-spv1.3",
-    )
+    )?
     .print_metadata(MetadataPrintout::DependencyOnly)
     .multimodule(true)
-    .build()
-    .unwrap();
+    .build()?;
     println!("{result:#?}");
+    Ok(())
 }

examples/runners/ash/src/main.rs

@@ -79,6 +79,8 @@ use winit::{
     event_loop::{ControlFlow, EventLoop},
 };
 
+use clap::Parser;
+use std::error::Error;
 use std::{
     borrow::Cow,
     collections::HashMap,
@@ -89,8 +91,6 @@ use std::{
     thread,
 };
 
-use clap::Parser;
-
 use spirv_builder::{MetadataPrintout, SpirvBuilder};
 
 use shared::ShaderConstants;
@@ -235,7 +235,7 @@ pub fn main() {
         .unwrap();
 }
 
-pub fn compile_shaders() -> Vec<SpvFile> {
+pub fn compile_shaders() -> Result<Vec<SpvFile>, Box<dyn Error>> {
     // Hack: spirv_builder builds into a custom directory if running under cargo, to not
     // deadlock, and the default target directory if not. However, packages like `proc-macro2`
     // have different configurations when being built here vs. when building
@@ -248,7 +248,7 @@ pub fn compile_shaders() -> Vec<SpvFile> {
     SpirvBuilder::new(
         concat!(env!("CARGO_MANIFEST_DIR"), "/../../shaders/sky-shader"),
         "spirv-unknown-vulkan1.1",
-    )
+    )?
     .print_metadata(MetadataPrintout::None)
     .shader_panic_strategy(spirv_builder::ShaderPanicStrategy::DebugPrintfThenExit {
         print_inputs: true,
@@ -257,8 +257,7 @@ pub fn compile_shaders() -> Vec<SpvFile> {
     // HACK(eddyb) needed because of `debugPrintf` instrumentation limitations
     // (see https://github.com/KhronosGroup/SPIRV-Tools/issues/4892).
     .multimodule(true)
-    .build()
-    .unwrap()
+    .build()?
     .module
     .unwrap_multi()
     .iter()

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

@@ -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, "spirv-unknown-vulkan1.1")?
         .print_metadata(MetadataPrintout::Full)
         .build()?;
     if codegen_names {

examples/runners/wgpu/src/lib.rs

@@ -154,6 +154,7 @@ fn maybe_watch(
 
         let builder = SpirvBuilder::new(crate_path, "spirv-unknown-vulkan1.1")
             .print_metadata(MetadataPrintout::None)
+            .unwrap()
             .shader_panic_strategy(if has_debug_printf {
                 spirv_builder::ShaderPanicStrategy::DebugPrintfThenExit {
                     print_inputs: true,

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

@@ -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, "spirv-unknown-vulkan1.1")?
             .print_metadata(spirv_builder::MetadataPrintout::None)
             .release(true)
             .multimodule(false)