maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/eval): Box Value::String

Browse source 
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>
This commit is contained in:
Aspen Smith 2024-02-01 12:28:29 -05:00 • committed by aspen
parent 4c5d9fa356
commit 5f0f4ea374
15 changed files with 69 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tvix/glue/src/builtins/derivation.rs
View file

@ -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(),
)))

8
tvix/glue/src/builtins/mod.rs
View file

@ -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),
}

4
tvix/glue/src/tvix_store_io.rs
View file

@ -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),
}