From d3d41552cf1f6485f8ebc597a2128a0d15b030a5 Mon Sep 17 00:00:00 2001 From: Aspen Smith Date: Wed, 31 Jan 2024 10:19:13 -0500 Subject: refactor(tvix/eval): Don't double-box Path values 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 rather than a Box 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 Autosubmit: aspen Tested-by: BuildkiteCI --- tvix/eval/src/builtins/mod.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tvix/eval/src/builtins/mod.rs') diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs index 6ccae2f9de..31cd78fade 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)); + 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()))) } -- cgit 1.4.1