diff options
| author | Bob van der Linden <bobvanderlinden@gmail.com> | 2024-11-03T15·59+0100 |
|---|---|---|
| committer | Bob van der Linden <bobvanderlinden@gmail.com> | 2024-11-04T10·39+0000 |
| commit | 9aa479648b63cbffdae4c6365549827692ca1914 (patch) | |
| tree | 28355d376af37fae2bfdbc39d550c55a5129e5e5 /tvix/serde | |
| parent | b6e524c7267f21173a29fdb9ad2bb72297299858 (diff) | |
refactor(tvix/eval): remove Value::Json and related functionality r/8890
Currently Value::Json is used in combination with VMRequest::ToJson to recursively convert tvix Value to serde_json::Value. This functionality is used in builtins.toJSON as well as derivation __structuredAttrs. Both Value::Json and VMRequest::ToJson were removed in this commit. Related functionality in vm.rs is also removed: vm.rs does not know about JSON anymore. Recursively converting to serde_json now happens without going through the VM. Thrown errors that are part of the value of toJSON are now directly propagated as ErrorKind, were-as previously there was a split between CatchableErrorKind and ErrorKind, where eventually CatchableErrorKind would be converted to ErrorKind::Catchable. Change-Id: I066f064926c491e4c087a984f07af43d19124cfe Reviewed-on: https://cl.tvl.fyi/c/depot/+/12732 Reviewed-by: flokli <flokli@flokli.de> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/serde')
| -rw-r--r-- | tvix/serde/src/de.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tvix/serde/src/de.rs b/tvix/serde/src/de.rs index 0728311c6a13..ac2e7ef5730a 100644 --- a/tvix/serde/src/de.rs +++ b/tvix/serde/src/de.rs @@ -105,7 +105,6 @@ impl<'de> de::Deserializer<'de> for NixDeserializer { | Value::Blueprint(_) | Value::DeferredUpvalue(_) | Value::UnresolvedPath(_) - | Value::Json(..) | Value::Catchable(_) | Value::FinaliseRequest(_) => Err(Error::Unserializable { value_type: self.value.type_of(), |