about summary refs log tree commit diff
path: root/tvix/serde
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2024-01-16T12·19+0200
committerflokli <flokli@flokli.de>2024-01-18T09·09+0000
commite0a867cabff021348cc283b25467cfd40b8eb15a (patch)
tree9b4f1fd63460ba8385b38259481a7bb32363801b /tvix/serde
parent44d24852c3c62320cb2a4c9b9627e744c518f207 (diff)
refactor(tvix/eval): generalize EvalIO container r/7407
Don't restrict to a Box<dyn EvalIO>.

There's still one or two places where we do restrict, this will be
solved by b/262.

Change-Id: Ic8d927d6ea81fa12d90b1e4352f35ffaafbd1adf
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10639
Tested-by: BuildkiteCI
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Diffstat (limited to 'tvix/serde')
-rw-r--r--tvix/serde/src/de.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/tvix/serde/src/de.rs b/tvix/serde/src/de.rs
index 500c9c98409d..4f16736af477 100644
--- a/tvix/serde/src/de.rs
+++ b/tvix/serde/src/de.rs
@@ -3,7 +3,7 @@
 use serde::de::value::{MapDeserializer, SeqDeserializer};
 use serde::de::{self, EnumAccess, VariantAccess};
 pub use tvix_eval::Evaluation;
-use tvix_eval::Value;
+use tvix_eval::{EvalIO, Value};
 
 use crate::error::Error;
 
@@ -43,7 +43,7 @@ where
 pub fn from_str_with_config<'code, T, F>(src: &'code str, config: F) -> Result<T, Error>
 where
     T: serde::Deserialize<'code>,
-    F: FnOnce(&mut Evaluation),
+    F: FnOnce(&mut Evaluation<Box<dyn EvalIO>>),
 {
     // First step is to evaluate the Nix code ...
     let mut eval = Evaluation::default();