fix: run cargo update before building spirv-builder-cli

Author: schell

crates/cargo-gpu/src/config.rs

@@ -104,9 +104,10 @@ impl Config {
             }
             (left, right) => {
                 if let Some(pointer) = maybe_pointer {
-                    let default = defaults
-                        .pointer(pointer)
-                        .context(format!("Config `{pointer}` not found in defaults"))?;
+                    let default = defaults.pointer(pointer).context(format!(
+                        "Configuration option with path `{pointer}` was not found in the default configuration, \
+                        which is:\ndefaults: {defaults:#?}"
+                    ))?;
                     if &right != default {
                         // Only overwrite if the new value differs from the defaults.
                         *left = right;

crates/cargo-gpu/src/install.rs

@@ -221,25 +221,35 @@ impl Install {
                 self.spirv_install.shader_crate.display()
             );
 
-            let mut command = std::process::Command::new("cargo");
-            command
+            // Run a `cargo update` just in case the cached Cargo.lock we copied over
+            // is a bit behind what's in rust-gpu
+            let mut update_command = std::process::Command::new("cargo");
+            update_command.current_dir(&checkout).arg("update");
+            let update_output = update_command
+                .stdout(std::process::Stdio::inherit())
+                .stderr(std::process::Stdio::inherit())
+                .output()?;
+            anyhow::ensure!(update_output.status.success(), "...cargo update error!");
+
+            let mut build_command = std::process::Command::new("cargo");
+            build_command
                 .current_dir(&checkout)
                 .arg(format!("+{}", spirv_version.channel))
                 .args(["build", "--release"])
                 .args(["--no-default-features"]);
 
-            command.args([
+            build_command.args([
                 "--features",
                 &Self::get_required_spirv_builder_version(spirv_version.date)?,
             ]);
 
-            log::debug!("building artifacts with `{:?}`", command);
+            log::debug!("building artifacts with `{:?}`", build_command);
 
-            let output = command
+            let build_output = build_command
                 .stdout(std::process::Stdio::inherit())
                 .stderr(std::process::Stdio::inherit())
                 .output()?;
-            anyhow::ensure!(output.status.success(), "...build error!");
+            anyhow::ensure!(build_output.status.success(), "...build error!");
 
             if dylib_path.is_file() {
                 log::info!("successfully built {}", dylib_path.display());

crates/cargo-gpu/src/metadata.rs

@@ -47,12 +47,22 @@ impl Metadata {
         let mut metadata = crate::config::Config::defaults_as_json()?;
         crate::config::Config::json_merge(
             &mut metadata,
-            Self::get_workspace_metadata(cargo_json),
+            {
+                log::debug!("looking for workspace metadata");
+                let ws_meta = Self::get_workspace_metadata(cargo_json);
+                log::trace!("workspace_metadata: {ws_meta:#?}");
+                ws_meta
+            },
             None,
         )?;
         crate::config::Config::json_merge(
             &mut metadata,
-            Self::get_crate_metadata(cargo_json, path)?,
+            {
+                log::debug!("looking for crate metadata");
+                let crate_meta = Self::get_crate_metadata(cargo_json, path)?;
+                log::trace!("crate_metadata: {crate_meta:#?}");
+                crate_meta
+            },
             None,
         )?;
 
@@ -118,6 +128,7 @@ impl Metadata {
                     let manifest_path = manifest_path_dirty.replace(r"\\?\", "");
                     log::debug!("Matching shader crate path with manifest path: {shader_crate_path} == {manifest_path}?");
                     if manifest_path == shader_crate_path {
+                        log::debug!("...matches! Getting metadata");
                         let mut metadata = package
                             .pointer("/metadata/rust-gpu")
                             .unwrap_or(&empty_json_object)