From c3c4d752c91f64eff8e7f7f7b21fbcc1209d27a6 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 12 Dec 2022 17:38:28 +0300 Subject: feat(tvix/eval): add EvalIO to public crate API This lets users set the `io_handle` field on an `Evaluation`, which is then propagated to the VM. Change-Id: I616d7140724fb2b4db47c2ebf95451d5303a487a Reviewed-on: https://cl.tvl.fyi/c/depot/+/7566 Reviewed-by: grfn Tested-by: BuildkiteCI --- tvix/eval/src/value/attrs/tests.rs | 6 +++--- tvix/eval/src/value/mod.rs | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'tvix/eval/src/value') diff --git a/tvix/eval/src/value/attrs/tests.rs b/tvix/eval/src/value/attrs/tests.rs index 65d3c8d7ca0e..2e80fa6f2308 100644 --- a/tvix/eval/src/value/attrs/tests.rs +++ b/tvix/eval/src/value/attrs/tests.rs @@ -10,7 +10,7 @@ mod nix_eq { #[proptest(ProptestConfig { cases: 2, ..Default::default() })] fn reflexive(x: NixAttrs) { let mut observer = NoOpObserver {}; - let mut vm = VM::new(Default::default(), &mut observer); + let mut vm = VM::new(Default::default(), Box::new(crate::DummyIO), &mut observer); assert!(x.nix_eq(&x, &mut vm).unwrap()) } @@ -18,7 +18,7 @@ mod nix_eq { #[proptest(ProptestConfig { cases: 2, ..Default::default() })] fn symmetric(x: NixAttrs, y: NixAttrs) { let mut observer = NoOpObserver {}; - let mut vm = VM::new(Default::default(), &mut observer); + let mut vm = VM::new(Default::default(), Box::new(crate::DummyIO), &mut observer); assert_eq!( x.nix_eq(&y, &mut vm).unwrap(), @@ -29,7 +29,7 @@ mod nix_eq { #[proptest(ProptestConfig { cases: 2, ..Default::default() })] fn transitive(x: NixAttrs, y: NixAttrs, z: NixAttrs) { let mut observer = NoOpObserver {}; - let mut vm = VM::new(Default::default(), &mut observer); + let mut vm = VM::new(Default::default(), Box::new(crate::DummyIO), &mut observer); if x.nix_eq(&y, &mut vm).unwrap() && y.nix_eq(&z, &mut vm).unwrap() { assert!(x.nix_eq(&z, &mut vm).unwrap()) diff --git a/tvix/eval/src/value/mod.rs b/tvix/eval/src/value/mod.rs index af75bc9a7346..583d0c38e46e 100644 --- a/tvix/eval/src/value/mod.rs +++ b/tvix/eval/src/value/mod.rs @@ -565,7 +565,7 @@ mod tests { #[proptest(ProptestConfig { cases: 5, ..Default::default() })] fn reflexive(x: Value) { let mut observer = NoOpObserver {}; - let mut vm = VM::new(Default::default(), &mut observer); + let mut vm = VM::new(Default::default(), Box::new(crate::DummyIO), &mut observer); assert!(x.nix_eq(&x, &mut vm).unwrap()) } @@ -573,7 +573,7 @@ mod tests { #[proptest(ProptestConfig { cases: 5, ..Default::default() })] fn symmetric(x: Value, y: Value) { let mut observer = NoOpObserver {}; - let mut vm = VM::new(Default::default(), &mut observer); + let mut vm = VM::new(Default::default(), Box::new(crate::DummyIO), &mut observer); assert_eq!( x.nix_eq(&y, &mut vm).unwrap(), @@ -584,7 +584,7 @@ mod tests { #[proptest(ProptestConfig { cases: 5, ..Default::default() })] fn transitive(x: Value, y: Value, z: Value) { let mut observer = NoOpObserver {}; - let mut vm = VM::new(Default::default(), &mut observer); + let mut vm = VM::new(Default::default(), Box::new(crate::DummyIO), &mut observer); if x.nix_eq(&y, &mut vm).unwrap() && y.nix_eq(&z, &mut vm).unwrap() { assert!(x.nix_eq(&z, &mut vm).unwrap()) @@ -594,7 +594,7 @@ mod tests { #[test] fn list_int_float_fungibility() { let mut observer = NoOpObserver {}; - let mut vm = VM::new(Default::default(), &mut observer); + let mut vm = VM::new(Default::default(), Box::new(crate::DummyIO), &mut observer); let v1 = Value::List(NixList::from(vec![Value::Integer(1)])); let v2 = Value::List(NixList::from(vec![Value::Float(1.0)])); -- cgit 1.4.1