fixup watch from SpirvBuilder changes

Author: Firestar99

Cargo.lock

@@ -13,7 +13,7 @@ exclude = [
 resolver = "2"
 
 [workspace.dependencies]
-spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu.git", rev = "0c7f509f7da93d0bd12d51230d15a07d0152c593", default-features = false }
+spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu.git", rev = "f35e492ae03df66ce989927dba2858656a9cf49a", default-features = false }
 anyhow = "1.0.94"
 clap = { version = "4.5.37", features = ["derive"] }
 crossterm = "0.28.1"

Cargo.toml

@@ -64,26 +64,31 @@ impl Build {
             std::env::current_dir()?.display()
         );
 
-        if !self.build_args.watch {
+        if self.build_args.watch {
+            let this = self.clone();
+            self.build_args
+                .spirv_builder
+                .watch(move |result, accept| {
+                    let result1 = this.parse_compilation_result(&result);
+                    if let Some(accept) = accept {
+                        accept.submit(result1);
+                    }
+                })?
+                .context("unreachable")??;
+            std::thread::park();
+        } else {
             crate::user_output!(
                 "Compiling shaders at {}...\n",
                 self.install.spirv_install.shader_crate.display()
             );
             let result = self.build_args.spirv_builder.build()?;
-            self.parse_compilation_result(result)?;
-            Ok(())
-        } else {
-            let this = self.clone();
-            self.build_args.spirv_builder.watch(move |result| {
-                this.parse_compilation_result(result)
-                    .expect("watch operation failed")
-            })?;
-            std::thread::park();
-            Ok(())
+            self.parse_compilation_result(&result)?;
         }
+        Ok(())
     }
 
-    fn parse_compilation_result(&self, result: CompileResult) -> anyhow::Result<()> {
+    /// Parses compilation result from `SpirvBuilder` and writes it out to a file
+    fn parse_compilation_result(&self, result: &CompileResult) -> anyhow::Result<()> {
         let shaders = match &result.module {
             ModuleResult::MultiModule(modules) => {
                 anyhow::ensure!(!modules.is_empty(), "No shader modules were compiled");