update spirv-builder

Author: Firestar99

Cargo.lock

@@ -15,7 +15,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 = "e97524f6b4816056b3edaa70c3e0e0c656392c05", 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::install::Install;
 use crate::linkage::Linkage;
 use crate::lockfile::LockfileMismatchHandler;
 use anyhow::Context as _;
-use spirv_builder::{CompileResult, ModuleResult, SpirvBuilder};
+use spirv_builder::{CompileResult, ModuleResult, SpirvBuilder, SpirvBuilderError};
 use std::io::Write as _;
 use std::path::PathBuf;
 
@@ -95,17 +95,22 @@ impl Build {
         );
 
         if self.build.watch {
-            let this = self.clone();
-            self.build
-                .spirv_builder
-                .watch(move |result, accept| {
-                    let result1 = this.parse_compilation_result(&result);
-                    if let Some(accept) = accept {
-                        accept.submit(result1);
+            let mut watcher = self.build.spirv_builder.clone().watch()?;
+            loop {
+                // if the build fails "regularly", eg. `cargo build` fails and nothing else, just retry
+                crate::user_output!(
+                    "Compiling shaders at {}...\n",
+                    self.install.shader_crate.display()
+                );
+                match watcher.recv() {
+                    Ok(result) => {
+                        self.parse_compilation_result(&result)?;
+                        crate::user_output!("Build successful!\n");
                     }
-                })?
-                .context("unreachable")??;
-            std::thread::park();
+                    Err(SpirvBuilderError::BuildFailed) => crate::user_output!("Build failed!\n"),
+                    Err(err) => return Err(anyhow::Error::from(err)),
+                }
+            }
         } else {
             crate::user_output!(
                 "Compiling shaders at {}...\n",

crates/cargo-gpu/src/build.rs

@@ -299,7 +299,7 @@ package = "rustc_codegen_spirv"
                 cargo.args(["-p", "rustc_codegen_spirv", "--lib"]);
             }
 
-            log::debug!("building artifacts with `{cargo}`");
+            log::debug!("building artifacts with `{cargo:?}`");
             cargo
                 .stdout(std::process::Stdio::inherit())
                 .stderr(std::process::Stdio::inherit())

crates/cargo-gpu/src/install.rs

@@ -74,7 +74,7 @@ pub use spirv_builder;
 /// Central function to write to the user.
 #[macro_export]
 macro_rules! user_output {
-    ($($args: tt)*) => {
+    ($($args: tt)*) => { {
         #[allow(
             clippy::allow_attributes,
             clippy::useless_attribute,
@@ -92,7 +92,7 @@ macro_rules! user_output {
         }
         print!($($args)*);
         std::io::stdout().flush().unwrap();
-   }
+   } }
 }
 
 /// All of the available subcommands for `cargo gpu`