From 939cebd0f17b8e8ec6a4664f9f7e0a5e1c6e3957 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 4 Mar 2023 02:12:06 +0300 Subject: fix(tvix/eval): implement cppnix JSON-serialisation semantics 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 Tested-by: BuildkiteCI --- tvix/eval/src/builtins/to_xml.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tvix/eval/src/builtins/to_xml.rs') 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: &mut EventWriter, 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())), -- cgit 1.4.1