about summary refs log tree commit diff
path: root/tvix/eval/src/value/path.rs
diff options
context:
space:
mode:
authorAdam Joseph <adam@westernsemico.com>2022-10-13T04·58-0700
committerAdam Joseph <adam@westernsemico.com>2022-10-13T09·07+0000
commit25336fc47b02fe90bf489402ed84f8259aa80ca8 (patch)
treefdeb65567b25173052fae52e4229e4ba8b77406b /tvix/eval/src/value/path.rs
parent534a2f95f86f3b0340040261ffc428d604210512 (diff)
refactor(tvix/eval): factor out all calls to canon_path r/5119
Right now we're pretending that the Rust library path_clean does the
same thing that cppnix's canonPath() does.  This is not true.  It's
close enough for the test suite, but may come back to bite us.

Let's create our own canon_path() function and call that in all the
places where we intend to match the behavior of cppnix's
canonPath().  That way when we fix this we can fix it once, in one
place.

Signed-off-by: Adam Joseph <adam@westernsemico.com>
Change-Id: Ia6f9577f62f49ef352ff9cfa5efdf37c32d31b11
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6993
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
Diffstat (limited to 'tvix/eval/src/value/path.rs')
-rw-r--r--tvix/eval/src/value/path.rs14
1 files changed, 14 insertions, 0 deletions
diff --git a/tvix/eval/src/value/path.rs b/tvix/eval/src/value/path.rs
new file mode 100644
index 000000000000..ad526a8746f8
--- /dev/null
+++ b/tvix/eval/src/value/path.rs
@@ -0,0 +1,14 @@
+use path_clean::PathClean;
+use std::path::PathBuf;
+
+/// This function should match the behavior of canonPath() in
+/// src/libutil/util.cc of cppnix.  Currently it does not match that
+/// behavior; it uses the `path_clean` library which is based on the
+/// Go standard library
+///
+/// TODO: make this match the behavior of cppnix
+/// TODO: write tests for this
+
+pub fn canon_path(path: PathBuf) -> PathBuf {
+    path.clean()
+}