about summary refs log tree commit diff
path: root/tvix/eval/src/vm
diff options
context:
space:
mode:
authorAspen Smith <root@gws.fyi>2024-01-31T15·19-0500
committeraspen <root@gws.fyi>2024-02-01T17·25+0000
commitd3d41552cf1f6485f8ebc597a2128a0d15b030a5 (patch)
treebc264d6e18f61768fcde06f53a1c8d558e1bea67 /tvix/eval/src/vm
parent201173afaca7d70aa039a1e37a91c49af3a99b0b (diff)
refactor(tvix/eval): Don't double-box Path values r/7461
PathBuf internally contains a heap pointer (an OsString), so we were in
effect double-boxing here. Removing the extra layer by making
Tvix::Value represented by a Box<Path> rather than a Box<PathBuf> saves
us an indirection, while still avoiding the extra memory overhead of the
capacity which was the reason we were boxing PathBuf in the first place.

Change-Id: I8c185b9d4646161d1921917f83e87421496a3e24
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10725
Reviewed-by: sterni <sternenseemann@systemli.org>
Autosubmit: aspen <root@gws.fyi>
Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/eval/src/vm')
-rw-r--r--tvix/eval/src/vm/mod.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/tvix/eval/src/vm/mod.rs b/tvix/eval/src/vm/mod.rs
index d51d44b6a110..6e36edd95670 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());
                             }
                         };
@@ -1222,7 +1222,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.into_os_string();
+            let mut path = p.as_os_str().to_owned();
             match generators::request_string_coerce(
                 &co,
                 v,