diff options
author | Aspen Smith <root@gws.fyi> | 2024-01-31T15·19-0500 |
---|---|---|
committer | aspen <root@gws.fyi> | 2024-02-01T17·25+0000 |
commit | d3d41552cf1f6485f8ebc597a2128a0d15b030a5 (patch) | |
tree | bc264d6e18f61768fcde06f53a1c8d558e1bea67 /tvix/eval/src/value/arbitrary.rs | |
parent | 201173afaca7d70aa039a1e37a91c49af3a99b0b (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/value/arbitrary.rs')
-rw-r--r-- | tvix/eval/src/value/arbitrary.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tvix/eval/src/value/arbitrary.rs b/tvix/eval/src/value/arbitrary.rs index bf53f4fcb28a..d894aa3fe937 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; +use std::{ffi::OsString, path::PathBuf}; 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::<NixString>().prop_map(String), - any::<OsString>().prop_map(|s| Path(Box::new(s.into()))), + any::<OsString>().prop_map(|s| Path(PathBuf::from(s).into_boxed_path())), ] } |