about summary refs log tree commit diff
path: root/tvix/eval/src/tests/mod.rs
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2024-01-16T13·35+0200
committerflokli <flokli@flokli.de>2024-01-18T14·24+0000
commit43b9e25025eef302369ff27074bfa5bbfb1c7115 (patch)
tree7bd8dd0c86ac8313edbbde9e4a702ba0d1cf17d9 /tvix/eval/src/tests/mod.rs
parentea03ff374b1d93985e2f77a13ad8bd9e070a5608 (diff)
refactor(tvix/eval): move Evaluation::{default,new_pure}() again r/7409
Have a Evaluation::new() function that's used to set up the Evaluation
struct initially - which is also used by both new_pure and new_impure
internally.

It's generic over the exact type of IO, making it easier to instantiate
Evaluation with non-tvix-eval EvalIO implementations, that might not be
in a Box.

Change-Id: Ibf728da24aca59639c5b6df58d00ae98c99a63f5
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10640
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/eval/src/tests/mod.rs')
-rw-r--r--tvix/eval/src/tests/mod.rs7
1 files changed, 2 insertions, 5 deletions
diff --git a/tvix/eval/src/tests/mod.rs b/tvix/eval/src/tests/mod.rs
index e3d3445a45..d8b593ae99 100644
--- a/tvix/eval/src/tests/mod.rs
+++ b/tvix/eval/src/tests/mod.rs
@@ -117,11 +117,8 @@ fn eval_test(code_path: PathBuf, expect_success: bool) {
 fn identity(#[files("src/tests/tvix_tests/identity-*.nix")] code_path: PathBuf) {
     let code = std::fs::read_to_string(code_path).expect("should be able to read test code");
 
-    let eval = crate::Evaluation {
-        strict: true,
-        io_handle: Box::new(crate::StdIO) as Box<dyn EvalIO>,
-        ..Default::default()
-    };
+    let mut eval = crate::Evaluation::new(Box::new(crate::StdIO) as Box<dyn EvalIO>, false);
+    eval.strict = true;
 
     let result = eval.evaluate(&code, None);
     assert!(