diff options
| author | Vincent Ambo <mail@tazj.in> | 2023-03-17T21·10+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-03-22T13·44+0000 |
| commit | ba138712e4c4a067e438a62ad20d54091f5f4446 (patch) | |
| tree | 79ece7a20ac6872b344c5841eb1d93f8d20daad9 /tvix/eval/src/lib.rs | |
| parent | a5f28eea94d74f98e37487ed04a024b83b8a94ff (diff) | |
feat(tvix/eval): add Evaluation::strict to toggle top-level deepseq r/6037
This makes it possible for callers to control whether they can receive partially evaluated values from an evaluation or not. We're actually flipping the default behaviour to non-strict top-level evaluation, which means that callers have to set `strict = true` on the Evaluation to get the previous behaviour. Change-Id: Ic048e9ba09c88866d4c3177d5fa07db11c4eb20e Reviewed-on: https://cl.tvl.fyi/c/depot/+/8325 Autosubmit: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'tvix/eval/src/lib.rs')
| -rw-r--r-- | tvix/eval/src/lib.rs | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/tvix/eval/src/lib.rs b/tvix/eval/src/lib.rs index c6bef65c72bb..deb48b50078e 100644 --- a/tvix/eval/src/lib.rs +++ b/tvix/eval/src/lib.rs @@ -104,6 +104,11 @@ pub struct Evaluation<'code, 'co, 'ro> { /// able to read the files specified as arguments to `import`. pub enable_import: bool, + /// Determines whether the returned value should be strictly + /// evaluated, that is whether its list and attribute set elements + /// should be forced recursively. + pub strict: bool, + /// (optional) Nix search path, e.g. the value of `NIX_PATH` used /// for resolving items on the search path (such as `<nixpkgs>`). pub nix_path: Option<String>, @@ -161,6 +166,7 @@ impl<'code, 'co, 'ro> Evaluation<'code, 'co, 'ro> { src_builtins: vec![], io_handle: Box::new(DummyIO {}), enable_import: false, + strict: false, nix_path: None, compiler_observer: None, runtime_observer: None, @@ -256,7 +262,15 @@ impl<'code, 'co, 'ro> Evaluation<'code, 'co, 'ro> { .unwrap_or_default(); let runtime_observer = self.runtime_observer.take().unwrap_or(&mut noop_observer); - let vm_result = run_lambda(nix_path, self.io_handle, runtime_observer, globals, lambda); + + let vm_result = run_lambda( + nix_path, + self.io_handle, + runtime_observer, + globals, + lambda, + self.strict, + ); match vm_result { Ok(mut runtime_result) => { |