mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/eval): remove Value::Json and related functionality

Browse source 
Currently Value::Json is used in combination with VMRequest::ToJson to
recursively convert tvix Value to serde_json::Value. This functionality
is used in builtins.toJSON as well as derivation __structuredAttrs.

Both Value::Json and VMRequest::ToJson were removed in this commit.

Related functionality in vm.rs is also removed: vm.rs does not know
about JSON anymore.

Recursively converting to serde_json now happens without going through
the VM.

Thrown errors that are part of the value of toJSON are now directly
propagated as ErrorKind, were-as previously there was a split between
CatchableErrorKind and ErrorKind, where eventually CatchableErrorKind
would be converted to ErrorKind::Catchable.

Change-Id: I066f064926c491e4c087a984f07af43d19124cfe
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12732
Reviewed-by: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
This commit is contained in:
Bob van der Linden 2024-11-03 16:59:40 +01:00
parent b6e524c726
commit 9aa479648b
8 changed files with 27 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tvix/glue/src/builtins/derivation.rs
View file

@ -300,7 +300,7 @@ pub(crate) mod derivation_builtins {
// Remove the original default `out` output.
drv.outputs.clear();
let mut output_names = vec![];
let mut output_names = Vec::with_capacity(outputs.len());
for output in outputs {
let output_name = generators::request_force(&co, output)
@ -379,11 +379,7 @@ pub(crate) mod derivation_builtins {
return Ok(val);
}
let (val_json, context) = match val.into_contextful_json(&co).await? {
Ok(v) => v,
Err(cek) => return Ok(Value::from(cek)),
};
let (val_json, context) = val.into_contextful_json(&co).await?;
input_context.extend(context.into_iter());
// No need to check for dups, we only iterate over every attribute name once