about summary refs log tree commit diff
path: root/tvix/eval/src/value/arbitrary.rs
diff options
context:
space:
mode:
authorAspen Smith <root@gws.fyi>2024-02-10T17·35-0500
committerclbot <clbot@tvl.fyi>2024-02-13T16·49+0000
commitdd261773192d0928571f806892d8065fbba1cf2d (patch)
tree583b8571587a3e3adfb0cc368116b873d2380396 /tvix/eval/src/value/arbitrary.rs
parente3c92ac3b4b07a7397b565738ec4237b9bf621f6 (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/value/arbitrary.rs')
-rw-r--r--tvix/eval/src/value/arbitrary.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/tvix/eval/src/value/arbitrary.rs b/tvix/eval/src/value/arbitrary.rs
index a2e8cb899c92..c14fbae6cb71 100644
--- a/tvix/eval/src/value/arbitrary.rs
+++ b/tvix/eval/src/value/arbitrary.rs
@@ -2,7 +2,7 @@
 
 use imbl::proptest::{ord_map, vector};
 use proptest::{prelude::*, strategy::BoxedStrategy};
-use std::{ffi::OsString, path::PathBuf};
+use std::ffi::OsString;
 
 use super::{attrs::AttrsRep, NixAttrs, NixList, NixString, Value};
 
@@ -92,7 +92,7 @@ fn leaf_value() -> impl Strategy<Value = Value> {
         any::<i64>().prop_map(Integer),
         any::<f64>().prop_map(Float),
         any::<Box<NixString>>().prop_map(String),
-        any::<OsString>().prop_map(|s| Path(PathBuf::from(s).into_boxed_path())),
+        any::<OsString>().prop_map(|s| Path(Box::new(s.into()))),
     ]
 }