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>

1 files changed, 4 insertions, 4 deletions

diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs
index a0b990ec54..d63b035c05 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.into()));
+        return Ok(Ok(*p));
     }
 
     match generators::request_string_coerce(
@@ -348,8 +348,8 @@ mod pure_builtins {
             })
             .unwrap_or(b".");
         if is_path {
-            Ok(Value::from(PathBuf::from(OsString::assert_from_raw_vec(
-                result.to_owned(),
+            Ok(Value::Path(Box::new(PathBuf::from(
+                OsString::assert_from_raw_vec(result.to_owned()),
             ))))
         } else {
             Ok(Value::from(NixString::new_inherit_context_from(
@@ -1586,7 +1586,7 @@ mod placeholder_builtins {
         let res = [
             ("line", 42.into()),
             ("col", 42.into()),
-            ("file", Value::from(PathBuf::from("/deep/thought"))),
+            ("file", Value::Path(Box::new("/deep/thought".into()))),
         ];
         Ok(Value::attrs(NixAttrs::from_iter(res.into_iter())))
     }