diff options
author | Aspen Smith <root@gws.fyi> | 2024-02-10T17·39-0500 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2024-02-13T16·49+0000 |
commit | 7e286aab1a573edc9aef16bb68e9907371917adc (patch) | |
tree | f3e9aeb1ac674800ed13dbb0bfacddfb50dd372e /tvix/eval/src/compiler | |
parent | dd261773192d0928571f806892d8065fbba1cf2d (diff) |
feat(tvix/eval): Box Value::Catchable r/7508
This is now the only enum variant for Value that is larger than 8 bytes (it's 16 bytes), so boxing it (especially since it's not perf-critical) allows us to get the Value size down to only 16 bytes! Change-Id: I98598e2b762944448bef982e8ff7da6d6683c4aa Reviewed-on: https://cl.tvl.fyi/c/depot/+/10798 Tested-by: BuildkiteCI Reviewed-by: raitobezarius <tvl@lahfa.xyz> Autosubmit: aspen <root@gws.fyi>
Diffstat (limited to 'tvix/eval/src/compiler')
-rw-r--r-- | tvix/eval/src/compiler/import.rs | 2 | ||||
-rw-r--r-- | tvix/eval/src/compiler/mod.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tvix/eval/src/compiler/import.rs b/tvix/eval/src/compiler/import.rs index 4e8ea7195d81..6774c7b8922c 100644 --- a/tvix/eval/src/compiler/import.rs +++ b/tvix/eval/src/compiler/import.rs @@ -27,7 +27,7 @@ async fn import_impl( ) -> Result<Value, ErrorKind> { // TODO(sterni): canon_path()? let mut path = match coerce_value_to_path(&co, args.pop().unwrap()).await? { - Err(cek) => return Ok(Value::Catchable(cek)), + Err(cek) => return Ok(Value::Catchable(Box::new(cek))), Ok(path) => path, }; diff --git a/tvix/eval/src/compiler/mod.rs b/tvix/eval/src/compiler/mod.rs index 0a9ee2320b1d..d64202c2ad74 100644 --- a/tvix/eval/src/compiler/mod.rs +++ b/tvix/eval/src/compiler/mod.rs @@ -399,9 +399,9 @@ impl Compiler<'_> { // TODO: decide what to do with findFile if raw_path.len() == 2 { return self.emit_constant( - Value::Catchable(CatchableErrorKind::NixPathResolution( + Value::Catchable(Box::new(CatchableErrorKind::NixPathResolution( "Empty <> path not allowed".into(), - )), + ))), node, ); } |