refactor(tvix/eval): remove Value::Json and related functionality
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:
parent
b6e524c726
commit
9aa479648b
8 changed files with 27 additions and 109 deletions
|
|
@ -10,15 +10,6 @@ Feel free to add new ideas. Before picking something, ask in `#tvix-dev` to make
|
|||
sure noone is working on this, or has some specific design in mind already.
|
||||
|
||||
## Cleanups
|
||||
### Evaluator
|
||||
- There's not really a good reason why the `tvix_eval::Value::Json` enum kind
|
||||
exists.
|
||||
`builtins.toJSON` should simply produce a string with context, and everything
|
||||
else should be a hidden implementation detail and should not be leaked to
|
||||
`Value`.
|
||||
This is a hack, as we wanted to use `serde_json` as is, but should be cleaned
|
||||
up.
|
||||
|
||||
### Nix language test suite
|
||||
- Think about how to merge, but "categorize" `tvix_tests` in `glue` and `eval`.
|
||||
We currently only have this split as they need a different feature set /
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue