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/builtins/to_xml.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/builtins/to_xml.rs')
| -rw-r--r-- | tvix/eval/src/builtins/to_xml.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tvix/eval/src/builtins/to_xml.rs b/tvix/eval/src/builtins/to_xml.rs index 750bb27aa226..375785b7a63e 100644 --- a/tvix/eval/src/builtins/to_xml.rs +++ b/tvix/eval/src/builtins/to_xml.rs @@ -126,7 +126,8 @@ fn value_variant_to_xml<W: Write>(w: &mut EventWriter<W>, value: &Value) -> Resu Value::AttrNotFound | Value::Blueprint(_) | Value::DeferredUpvalue(_) - | Value::UnresolvedPath(_) => { + | Value::UnresolvedPath(_) + | Value::Json(_) => { return Err(ErrorKind::TvixBug { msg: "internal value variant encountered in builtins.toXML", metadata: Some(Rc::new(value.clone())), |