diff options
| author | Aspen Smith <root@gws.fyi> | 2024-02-10T17·35-0500 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2024-02-13T16·49+0000 |
| commit | dd261773192d0928571f806892d8065fbba1cf2d (patch) | |
| tree | 583b8571587a3e3adfb0cc368116b873d2380396 /tvix/eval/src/vm/mod.rs | |
| parent | e3c92ac3b4b07a7397b565738ec4237b9bf621f6 (diff) | |
revert(tvix/eval): Don't double-box Path values r/7507
This reverts commit d3d41552cf1f6485f8ebc597a2128a0d15b030a5. This was well-intentioned, but now the boxed Path values are actually the *largest* Value enum variants, at 16 bytes (because they're fat-pointers, with a len) instead of 8 bytes like all the other values. Having the double reference is a reasonable price to pay (it seems; more benchmarks may end up disagreeing) for a smaller Value repr. Change-Id: I0d3e84f646c8f5ffd0b7259c4e456637eea360f7 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10797 Tested-by: BuildkiteCI Autosubmit: aspen <root@gws.fyi> Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'tvix/eval/src/vm/mod.rs')
| -rw-r--r-- | tvix/eval/src/vm/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tvix/eval/src/vm/mod.rs b/tvix/eval/src/vm/mod.rs index 6483122f96f6..7c2f5b97960f 100644 --- a/tvix/eval/src/vm/mod.rs +++ b/tvix/eval/src/vm/mod.rs @@ -862,7 +862,7 @@ where Value::UnresolvedPath(path) => { let resolved = self .nix_search_path - .resolve(&self.io_handle, path) + .resolve(&self.io_handle, *path) .with_span(&frame, self)?; self.stack.push(resolved.into()); } @@ -882,7 +882,7 @@ where ); } Some(mut buf) => { - buf.push(path); + buf.push(*path); self.stack.push(buf.into()); } }; @@ -1225,7 +1225,7 @@ async fn add_values(co: GenCo, a: Value, b: Value) -> Result<Value, ErrorKind> { // What we try to do is solely determined by the type of the first value! let result = match (a, b) { (Value::Path(p), v) => { - let mut path = p.as_os_str().to_owned(); + let mut path = p.into_os_string(); match generators::request_string_coerce( &co, v, |