diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-09-10T05·02-0700 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-09-24T21·54+0000 |
| commit | 05f42519b53575ad3235b5e0a0cd7d71f04076a5 (patch) | |
| tree | 82c5bdb55450615c0cf3169e25668426c9798e09 /tvix/serde | |
| parent | 926459ce694536432c36d8f0d3fb25b821945852 (diff) | |
fix(tvix/eval): fix b/281 by adding Value::Catchable r/6650
This commit makes catchable errors a variant of Value. The main downside of this approach is that we lose the ability to use Rust's `?` syntax for propagating catchable errors. Change-Id: Ibe89438d8a70dcec29e016df692b5bf88a5cad13 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9289 Reviewed-by: tazjin <tazjin@tvl.su> Autosubmit: Adam Joseph <adam@westernsemico.com> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/serde')
| -rw-r--r-- | tvix/serde/src/de.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tvix/serde/src/de.rs b/tvix/serde/src/de.rs index 59a72b7417f9..2e8a9618e637 100644 --- a/tvix/serde/src/de.rs +++ b/tvix/serde/src/de.rs @@ -109,6 +109,7 @@ impl<'de> de::Deserializer<'de> for NixDeserializer { | Value::DeferredUpvalue(_) | Value::UnresolvedPath(_) | Value::Json(_) + | Value::Catchable(_) | Value::FinaliseRequest(_) => Err(Error::Unserializable { value_type: self.value.type_of(), }), |