From e0a867cabff021348cc283b25467cfd40b8eb15a Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 16 Jan 2024 14:19:16 +0200
Subject: refactor(tvix/eval): generalize EvalIO container

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>
---
 tvix/glue/src/builtins/mod.rs | 4 ++--
 tvix/glue/src/lib.rs          | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'tvix/glue/src')

diff --git a/tvix/glue/src/builtins/mod.rs b/tvix/glue/src/builtins/mod.rs
index 3656bb9d1616..22166055d067 100644
--- a/tvix/glue/src/builtins/mod.rs
+++ b/tvix/glue/src/builtins/mod.rs
@@ -14,8 +14,8 @@ pub use derivation_error::Error as DerivationError;
 ///
 /// As they need to interact with `known_paths`, we also need to pass in
 /// `known_paths`.
-pub fn add_derivation_builtins(
-    eval: &mut tvix_eval::Evaluation,
+pub fn add_derivation_builtins<IO>(
+    eval: &mut tvix_eval::Evaluation<IO>,
     known_paths: Rc<RefCell<KnownPaths>>,
 ) {
     eval.builtins
diff --git a/tvix/glue/src/lib.rs b/tvix/glue/src/lib.rs
index 31bcbede37d4..b2f586ce52d6 100644
--- a/tvix/glue/src/lib.rs
+++ b/tvix/glue/src/lib.rs
@@ -11,7 +11,10 @@ mod tests;
 /// Tell the Evaluator to resolve `<nix>` to the path `/__corepkgs__`,
 /// which has special handling in [tvix_io::TvixIO].
 /// This is used in nixpkgs to import `fetchurl.nix` from `<nix>`.
-pub fn configure_nix_path(eval: &mut tvix_eval::Evaluation, nix_search_path: &Option<String>) {
+pub fn configure_nix_path<IO>(
+    eval: &mut tvix_eval::Evaluation<IO>,
+    nix_search_path: &Option<String>,
+) {
     eval.nix_path = nix_search_path
         .as_ref()
         .map(|p| format!("nix=/__corepkgs__:{}", p))
-- 
cgit 1.4.1