diff options
author | Adam Joseph <adam@westernsemico.com> | 2022-10-13T04·58-0700 |
---|---|---|
committer | Adam Joseph <adam@westernsemico.com> | 2022-10-13T09·07+0000 |
commit | 25336fc47b02fe90bf489402ed84f8259aa80ca8 (patch) | |
tree | fdeb65567b25173052fae52e4229e4ba8b77406b /tvix/eval/src/compiler/mod.rs | |
parent | 534a2f95f86f3b0340040261ffc428d604210512 (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/compiler/mod.rs')
-rw-r--r-- | tvix/eval/src/compiler/mod.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tvix/eval/src/compiler/mod.rs b/tvix/eval/src/compiler/mod.rs index 9bd37cef8578..e4c2c159da40 100644 --- a/tvix/eval/src/compiler/mod.rs +++ b/tvix/eval/src/compiler/mod.rs @@ -17,7 +17,6 @@ mod bindings; mod scope; use codemap::Span; -use path_clean::PathClean; use rnix::ast::{self, AstToken}; use smol_str::SmolStr; use std::cell::RefCell; @@ -300,7 +299,7 @@ impl Compiler<'_> { // TODO: Use https://github.com/rust-lang/rfcs/issues/2208 // once it is available - let value = Value::Path(path.clean()); + let value = Value::Path(crate::value::canon_path(path)); self.emit_constant(value, node); } |