From 5f0f4ea3746d6107839454bb5f4967d8757f5bb8 Mon Sep 17 00:00:00 2001 From: Aspen Smith Date: Thu, 1 Feb 2024 12:28:29 -0500 Subject: refactor(tvix/eval): Box Value::String NixString is *quite* large - like 80 bytes - because of the extra capacity value for BString and because of the context. We want to keep Value small since we're passing it around a lot, so let's box the NixString inside Value::String to save on some memory, and make cloning ostensibly a little cheaper Change-Id: I343c8b4e7f61dc3dcbbaba4382efb3b3e5bbabb2 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10729 Tested-by: BuildkiteCI Reviewed-by: sterni --- tvix/glue/src/builtins/derivation.rs | 2 +- tvix/glue/src/builtins/mod.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tvix/glue/src/builtins') diff --git a/tvix/glue/src/builtins/derivation.rs b/tvix/glue/src/builtins/derivation.rs index 93a885bdd994..b1487f4505e0 100644 --- a/tvix/glue/src/builtins/derivation.rs +++ b/tvix/glue/src/builtins/derivation.rs @@ -530,7 +530,7 @@ pub(crate) mod derivation_builtins { // TODO: actually persist the file in the store at that path ... - Ok(Value::String(NixString::new_context_from( + Ok(Value::from(NixString::new_context_from( context, path.into(), ))) diff --git a/tvix/glue/src/builtins/mod.rs b/tvix/glue/src/builtins/mod.rs index c3c267a98782..dff6a8947c16 100644 --- a/tvix/glue/src/builtins/mod.rs +++ b/tvix/glue/src/builtins/mod.rs @@ -74,7 +74,7 @@ mod tests { match value { tvix_eval::Value::String(s) => { - assert_eq!(s, "/nix/store/xpcvxsx5sw4rbq666blz6sxqlmsqphmr-foo",); + assert_eq!(*s, "/nix/store/xpcvxsx5sw4rbq666blz6sxqlmsqphmr-foo",); } _ => panic!("unexpected value type: {:?}", value), } @@ -159,7 +159,7 @@ mod tests { match value { tvix_eval::Value::String(s) => { - assert_eq!(s, expected_path); + assert_eq!(*s, expected_path); } _ => panic!("unexpected value type: {:?}", value), } @@ -282,7 +282,7 @@ mod tests { match value { tvix_eval::Value::String(s) => { - assert_eq!(s, expected_drvpath); + assert_eq!(*s, expected_drvpath); } _ => panic!("unexpected value type: {:?}", value), @@ -311,7 +311,7 @@ mod tests { match value { tvix_eval::Value::String(s) => { - assert_eq!(s, expected_path); + assert_eq!(*s, expected_path); } _ => panic!("unexpected value type: {:?}", value), } -- cgit 1.4.1