diff options
| author | Vincent Ambo <mail@tazj.in> | 2023-01-10T11·52+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-01-12T10·42+0000 |
| commit | 02d35e4aa6ef84cdbd01d881bdc5c1acd50fc7dc (patch) | |
| tree | 86e4a57d551e8c47debbc703d3db3ac106677a22 /tvix/eval/src/value/mod.rs | |
| parent | fc7e52b4acc3f70968d0c063942b106da31eb8aa (diff) | |
feat(tvix/eval): implement builtins.toJSON r/5652
Implements `Serialize` for `tvix_eval::Value`. Special care is taken with serialisation of attribute sets, and forcing of thunks. The tests should cover both cases well. Change-Id: I9bb135bacf6f87bc6bd0bd88cef0a42308e6c335 Reviewed-on: https://cl.tvl.fyi/c/depot/+/7803 Reviewed-by: flokli <flokli@flokli.de> Tested-by: BuildkiteCI Autosubmit: tazjin <tazjin@tvl.su>
Diffstat (limited to 'tvix/eval/src/value/mod.rs')
| -rw-r--r-- | tvix/eval/src/value/mod.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tvix/eval/src/value/mod.rs b/tvix/eval/src/value/mod.rs index 89e8fdd093..357ffa6161 100644 --- a/tvix/eval/src/value/mod.rs +++ b/tvix/eval/src/value/mod.rs @@ -6,7 +6,7 @@ use std::path::PathBuf; use std::rc::Rc; use std::{cell::Ref, fmt::Display}; -use serde::Deserialize; +use serde::{Deserialize, Serialize}; #[cfg(feature = "arbitrary")] mod arbitrary; @@ -33,7 +33,7 @@ pub use thunk::Thunk; use self::thunk::ThunkSet; #[warn(variant_size_differences)] -#[derive(Clone, Debug, Deserialize)] +#[derive(Clone, Debug, Serialize, Deserialize)] #[serde(untagged)] pub enum Value { Null, @@ -49,12 +49,13 @@ pub enum Value { #[serde(skip)] Closure(Rc<Closure>), // must use Rc<Closure> here in order to get proper pointer equality + #[serde(skip)] Builtin(Builtin), // Internal values that, while they technically exist at runtime, // are never returned to or created directly by users. - #[serde(skip)] + #[serde(skip_deserializing)] Thunk(Thunk), // See [`compiler::compile_select_or()`] for explanation |