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/value/json.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/value/json.rs')
-rw-r--r-- | tvix/eval/src/value/json.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tvix/eval/src/value/json.rs b/tvix/eval/src/value/json.rs index efd2763f1c36..7ab1655d9055 100644 --- a/tvix/eval/src/value/json.rs +++ b/tvix/eval/src/value/json.rs @@ -61,7 +61,7 @@ impl Value { ) .await? { - Value::Catchable(cek) => return Ok(Err(cek)), + Value::Catchable(cek) => return Ok(Err(*cek)), Value::String(s) => return Ok(Ok(Json::String(s.to_str()?.to_owned()))), _ => panic!("Value::coerce_to_string_() returned a non-string!"), } @@ -88,7 +88,7 @@ impl Value { Json::Object(out) } - Value::Catchable(c) => return Ok(Err(c)), + Value::Catchable(c) => return Ok(Err(*c)), val @ Value::Closure(_) | val @ Value::Thunk(_) @@ -110,7 +110,7 @@ impl Value { /// Value::Json. pub(crate) async fn into_json_generator(self, co: GenCo) -> Result<Value, ErrorKind> { match self.into_json(&co).await? { - Err(cek) => Ok(Value::Catchable(cek)), + Err(cek) => Ok(Value::from(cek)), Ok(json) => Ok(Value::Json(Box::new(json))), } } |