maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/eval): implement cppnix JSON-serialisation semantics

Browse source 
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
This commit is contained in:
Vincent Ambo 2023-03-04 02:12:06 +03:00 • committed by tazjin
parent 1e37f8b52e
commit 939cebd0f1
12 changed files with 138 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tvix/eval/src/errors.rs
View file

@ -134,6 +134,9 @@ pub enum ErrorKind {
/// Errors converting JSON to a value
FromJsonError(String),
/// Nix value that can not be serialised to JSON.
NotSerialisableToJson(&'static str),
/// Errors converting TOML to a value
FromTomlError(String),
@ -442,6 +445,10 @@ to a missing value in the attribute set(s) included via `with`."#,
write!(f, "Error converting JSON to a Nix value: {msg}")
}
ErrorKind::NotSerialisableToJson(_type) => {
write!(f, "a {} cannot be converted to JSON", _type)
}
ErrorKind::FromTomlError(msg) => {
write!(f, "Error converting TOML to a Nix value: {msg}")
}
@ -761,6 +768,7 @@ impl Error {
| ErrorKind::ImportCompilerError { .. }
| ErrorKind::IO { .. }
| ErrorKind::FromJsonError(_)
| ErrorKind::NotSerialisableToJson(_)
| ErrorKind::FromTomlError(_)
| ErrorKind::Xml(_)
| ErrorKind::TvixError(_)
@ -809,6 +817,7 @@ impl Error {
ErrorKind::DivisionByZero => "E033",
ErrorKind::Xml(_) => "E034",
ErrorKind::FromTomlError(_) => "E035",
ErrorKind::NotSerialisableToJson(_) => "E036",
// Special error code for errors from other Tvix
// components. We may want to introduce a code namespacing