about summary refs log tree commit diff
path: root/tvix/eval/Cargo.lock
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2022-08-12T15·52+0300
committertazjin <tazjin@tvl.su>2022-08-28T11·02+0000
commitde21d201ba7bca518ebbcfa091cdff94d7ea152e (patch)
treee2503b919bc723de9bcd9a92b393a34fe5ea72bd /tvix/eval/Cargo.lock
parent6fe5e2d75257504f0321e2e98b6fb675b716fe25 (diff)
fix(tvix/eval): use path_clean instead of fs::canonicalize for paths r/4520
Canonicalisation performs much more functionality than what C++ Nix
implements for paths, and causes some undesirable behaviour (e.g.
handling non-existant files becomes difficult, but should be possible
in literals).

Instead, the path_clean crate provides a pure normalisation method.

There is an intention to add this to Rust itself:
https://github.com/rust-lang/rfcs/issues/2208

Change-Id: I775d238136db0a52cf6b12a68985833c8fb32882
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6186
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'tvix/eval/Cargo.lock')
-rw-r--r--tvix/eval/Cargo.lock7
1 files changed, 7 insertions, 0 deletions
diff --git a/tvix/eval/Cargo.lock b/tvix/eval/Cargo.lock
index c25839fdbb47..ecd0f05e409d 100644
--- a/tvix/eval/Cargo.lock
+++ b/tvix/eval/Cargo.lock
@@ -464,6 +464,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
 [[package]]
+name = "path-clean"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecba01bf2678719532c5e3059e0b5f0811273d94b397088b82e3bd0a78c78fdd"
+
+[[package]]
 name = "plotters"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -834,6 +840,7 @@ version = "0.1.0"
 dependencies = [
  "criterion",
  "dirs",
+ "path-clean",
  "rnix",
  "rustyline",
  "smol_str",