about summary refs log tree commit diff
path: root/tvix/eval/src/builtins
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/builtins
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/builtins')
-rw-r--r--tvix/eval/src/builtins/mod.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs
index 6ccae2f9de1c..31cd78fadeab 100644
--- a/tvix/eval/src/builtins/mod.rs
+++ b/tvix/eval/src/builtins/mod.rs
@@ -53,7 +53,7 @@ pub async fn coerce_value_to_path(
 ) -> Result<Result<PathBuf, CatchableErrorKind>, ErrorKind> {
     let value = generators::request_force(co, v).await;
     if let Value::Path(p) = value {
-        return Ok(Ok(*p));
+        return Ok(Ok(p.into()));
     }
 
     match generators::request_string_coerce(
@@ -400,8 +400,8 @@ mod pure_builtins {
             })
             .unwrap_or(b".");
         if is_path {
-            Ok(Value::Path(Box::new(PathBuf::from(
-                OsString::assert_from_raw_vec(result.to_owned()),
+            Ok(Value::from(PathBuf::from(OsString::assert_from_raw_vec(
+                result.to_owned(),
             ))))
         } else {
             Ok(Value::String(NixString::new_inherit_context_from(
@@ -1713,7 +1713,7 @@ mod placeholder_builtins {
         let res = [
             ("line", 42.into()),
             ("col", 42.into()),
-            ("file", Value::Path(Box::new("/deep/thought".into()))),
+            ("file", Value::from(PathBuf::from("/deep/thought"))),
         ];
         Ok(Value::attrs(NixAttrs::from_iter(res.into_iter())))
     }