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/vm/generators.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/vm/generators.rs')
-rw-r--r-- | tvix/eval/src/vm/generators.rs | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/tvix/eval/src/vm/generators.rs b/tvix/eval/src/vm/generators.rs index 7a1ba0153d24..9b055eb1c826 100644 --- a/tvix/eval/src/vm/generators.rs +++ b/tvix/eval/src/vm/generators.rs @@ -114,6 +114,10 @@ pub enum GeneratorRequest { /// Request evaluation of `builtins.tryEval` from the VM. See /// [`VM::catch_result`] for an explanation of how this works. TryForce(Value), + + /// Request serialisation of a value to JSON, according to the + /// slightly odd Nix evaluation rules. + ToJson(Value), } /// Human-readable representation of a generator message, used by observers. @@ -160,6 +164,7 @@ impl Display for GeneratorRequest { GeneratorRequest::ReadDir(p) => write!(f, "read_dir({})", p.to_string_lossy()), GeneratorRequest::Span => write!(f, "span"), GeneratorRequest::TryForce(v) => write!(f, "try_force({})", v.type_of()), + GeneratorRequest::ToJson(v) => write!(f, "to_json({})", v.type_of()), } } } @@ -440,6 +445,14 @@ impl<'o> VM<'o> { self.enqueue_generator("force", span, |co| value.force(co)); return Ok(false); } + + GeneratorRequest::ToJson(value) => { + self.reenqueue_generator(name, span.clone(), generator); + self.enqueue_generator("to_json", span, |co| { + value.to_json_generator(co) + }); + return Ok(false); + } } } @@ -708,6 +721,16 @@ pub(crate) async fn request_span(co: &GenCo) -> LightSpan { } } +pub(crate) async fn request_to_json(co: &GenCo, value: Value) -> serde_json::Value { + match co.yield_(GeneratorRequest::ToJson(value)).await { + GeneratorResponse::Value(Value::Json(json)) => json, + msg => panic!( + "Tvix bug: VM responded with incorrect generator message: {}", + msg + ), + } +} + /// Call the given value as if it was an attribute set containing a functor. The /// arguments must already be prepared on the stack when a generator frame from /// this function is invoked. |