diff options
| author | Aspen Smith <root@gws.fyi> | 2024-02-01T17·28-0500 |
|---|---|---|
| committer | aspen <root@gws.fyi> | 2024-02-02T16·16+0000 |
| commit | 5f0f4ea3746d6107839454bb5f4967d8757f5bb8 (patch) | |
| tree | e618eca064cb7e263c58136f2c07b1dead63f49c /tvix/glue | |
| parent | 4c5d9fa356bcb6dcd746129dde934412b44fdd35 (diff) | |
refactor(tvix/eval): Box Value::String r/7467
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 <sternenseemann@systemli.org>
Diffstat (limited to 'tvix/glue')
| -rw-r--r-- | tvix/glue/src/builtins/derivation.rs | 2 | ||||
| -rw-r--r-- | tvix/glue/src/builtins/mod.rs | 8 | ||||
| -rw-r--r-- | tvix/glue/src/tvix_store_io.rs | 4 |
3 files changed, 7 insertions, 7 deletions
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), } diff --git a/tvix/glue/src/tvix_store_io.rs b/tvix/glue/src/tvix_store_io.rs index fea336e2350b..4146ededb40c 100644 --- a/tvix/glue/src/tvix_store_io.rs +++ b/tvix/glue/src/tvix_store_io.rs @@ -356,7 +356,7 @@ mod tests { let value = result.value.expect("must be some"); match value { - tvix_eval::Value::String(s) => Some((**s).clone().into_string_lossy()), + tvix_eval::Value::String(s) => Some((***s).clone().into_string_lossy()), _ => panic!("unexpected value type: {:?}", value), } } @@ -422,7 +422,7 @@ mod tests { match value { tvix_eval::Value::String(s) => { - assert_eq!(s, "/deep/thought"); + assert_eq!(*s, "/deep/thought"); } _ => panic!("unexpected value type: {:?}", value), } |