From dd261773192d0928571f806892d8065fbba1cf2d Mon Sep 17 00:00:00 2001 From: Aspen Smith Date: Sat, 10 Feb 2024 12:35:44 -0500 Subject: revert(tvix/eval): Don't double-box Path values 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 Reviewed-by: sterni --- tvix/eval/src/builtins/mod.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tvix/eval/src/builtins') diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs index a0b990ec542c..d63b035c053e 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, 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()))) } -- cgit 1.4.1