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/vm/generators.rs | |
| 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/vm/generators.rs')
| -rw-r--r-- | tvix/eval/src/vm/generators.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tvix/eval/src/vm/generators.rs b/tvix/eval/src/vm/generators.rs index cffe36e60239..fba4e7cd90d2 100644 --- a/tvix/eval/src/vm/generators.rs +++ b/tvix/eval/src/vm/generators.rs @@ -609,7 +609,7 @@ pub async fn request_string_coerce( match val { Value::String(s) => Ok(*s), _ => match co.yield_(VMRequest::StringCoerce(val, kind)).await { - VMResponse::Value(Value::Catchable(c)) => Err(c), + VMResponse::Value(Value::Catchable(c)) => Err(*c), VMResponse::Value(value) => Ok(value .to_contextful_str() .expect("coerce_to_string always returns a string")), @@ -644,7 +644,7 @@ pub(crate) async fn check_equality( .await { VMResponse::Value(Value::Bool(b)) => Ok(Ok(b)), - VMResponse::Value(Value::Catchable(cek)) => Ok(Err(cek)), + VMResponse::Value(Value::Catchable(cek)) => Ok(Err(*cek)), msg => panic!( "Tvix bug: VM responded with incorrect generator message: {}", msg @@ -776,7 +776,7 @@ pub(crate) async fn request_to_json( ) -> Result<serde_json::Value, CatchableErrorKind> { match co.yield_(VMRequest::ToJson(value)).await { VMResponse::Value(Value::Json(json)) => Ok(*json), - VMResponse::Value(Value::Catchable(cek)) => Err(cek), + VMResponse::Value(Value::Catchable(cek)) => Err(*cek), msg => panic!( "Tvix bug: VM responded with incorrect generator message: {}", msg |