Skip to content

Fix differing path display on Windows #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
schell merged 1 commit into from
Sep 18, 2025
Merged

Fix differing path display on Windows #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,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"] }
Expand Down
1 change: 1 addition & 0 deletions crates/cargo-gpu/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ serde.workspace = true
serde_json.workspace = true
crossterm.workspace = true
semver.workspace = true
dunce.workspace = true

[dev-dependencies]
test-log.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions crates/cargo-gpu/src/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,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 '{}')",
Expand Down
Loading