diff options
author | Vincent Ambo <mail@tazj.in> | 2023-03-03T23·12+0300 |
---|---|---|
committer | tazjin <tazjin@tvl.su> | 2023-03-13T20·30+0000 |
commit | 939cebd0f17b8e8ec6a4664f9f7e0a5e1c6e3957 (patch) | |
tree | f4effe5bb4fd84c8d66c893a573177fc8c5f8195 /tvix/eval/src/value/attrs.rs | |
parent | 1e37f8b52e3d42fed3e05b327ef30c83e97fd02a (diff) |
fix(tvix/eval): implement cppnix JSON-serialisation semantics r/5979
This drops the usage of serde::Serialize, as the trait can not be used to implement the correct semantics (function colouring!). Instead, a manual JSON serialisation function is written which correctly handles toString, outPath and other similar weirdnesses. Unexpectedly, the eval-okay-tojson test from the C++ Nix test suite now passes, too. This fixes an issue where serialising data structures containing derivations to JSON would fail. Change-Id: I5c39e3d8356ee93a07eda481410f88610f6dd9f8 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8209 Reviewed-by: raitobezarius <tvl@lahfa.xyz> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/eval/src/value/attrs.rs')
-rw-r--r-- | tvix/eval/src/value/attrs.rs | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/tvix/eval/src/value/attrs.rs b/tvix/eval/src/value/attrs.rs index e4584e3aa2f7..bacfd22217bd 100644 --- a/tvix/eval/src/value/attrs.rs +++ b/tvix/eval/src/value/attrs.rs @@ -10,8 +10,7 @@ use std::iter::FromIterator; use imbl::{ordmap, OrdMap}; use lazy_static::lazy_static; use serde::de::{Deserializer, Error, Visitor}; -use serde::ser::SerializeMap; -use serde::{Deserialize, Serialize}; +use serde::Deserialize; use super::string::NixString; use super::thunk::ThunkSet; @@ -151,24 +150,6 @@ impl TotalDisplay for NixAttrs { } } -impl Serialize for NixAttrs { - fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> - where - S: serde::Serializer, - { - match &self.0 { - AttrsRep::Empty => serializer.serialize_map(Some(0))?.end(), - AttrsRep::KV { name, value } => { - let mut map = serializer.serialize_map(Some(2))?; - map.serialize_entry("name", name)?; - map.serialize_entry("value", value)?; - map.end() - } - AttrsRep::Im(map) => map.serialize(serializer), - } - } -} - impl<'de> Deserialize<'de> for NixAttrs { fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where |