Merge branch 'main' into split-lib-bin-deps

Author: tuguzT

Cargo.lock

@@ -37,6 +37,7 @@ test-log = "0.2.18"
 cargo_metadata = "0.21.0"
 cargo-util-schemas = "0.8.2"
 semver = "1.0.26"
+dunce = "1.0.5"
 
 # This crate MUST NEVER be upgraded, we need this particular "first" version to support old rust-gpu builds
 legacy_target_specs = { package = "rustc_codegen_spirv-target-specs", version = "0.9.0", features = ["include_str"] }

Cargo.toml

@@ -21,6 +21,7 @@ serde.workspace = true
 serde_json.workspace = true
 crossterm.workspace = true
 semver.workspace = true
+dunce.workspace = true
 
 [dev-dependencies]
 test-log.workspace = true

crates/cargo-gpu/Cargo.toml

@@ -81,12 +81,12 @@ impl Build {
             self.build.output_dir.display()
         );
         std::fs::create_dir_all(&self.build.output_dir)?;
-        let canonicalized = self.build.output_dir.canonicalize()?;
+        let canonicalized = dunce::canonicalize(&self.build.output_dir)?;
         log::debug!("canonicalized output dir: {}", canonicalized.display());
         self.build.output_dir = canonicalized;
 
         // Ensure the shader crate exists
-        self.install.shader_crate = self.install.shader_crate.canonicalize()?;
+        self.install.shader_crate = dunce::canonicalize(&self.install.shader_crate)?;
         anyhow::ensure!(
             self.install.shader_crate.exists(),
             "shader crate '{}' does not exist. (Current dir is '{}')",