From ba4807e1de44a234fc9499dad0011440cde113fb Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 17 May 2023 18:33:22 +0300 Subject: refactor(tvix/cli): split CLI-specific IO logic into TvixIO type This adds a wrapper type TvixIO, which can wrap around an arbitrary EvalIO implementation and perform actions needed for the Tvix CLI (marking imported paths as known, and handling __corepkgs__). Change-Id: I5fc1ca199b9f94b21a89103b84575e0f8f58dff9 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8579 Tested-by: BuildkiteCI Reviewed-by: flokli --- tvix/cli/src/main.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tvix/cli/src/main.rs') diff --git a/tvix/cli/src/main.rs b/tvix/cli/src/main.rs index 99b5b451f56c..9a81cff50863 100644 --- a/tvix/cli/src/main.rs +++ b/tvix/cli/src/main.rs @@ -3,6 +3,7 @@ mod errors; mod known_paths; mod nix_compat; mod refscan; +mod tvix_io; use std::cell::RefCell; use std::rc::Rc; @@ -62,7 +63,10 @@ fn interpret(code: &str, path: Option, args: &Args, explain: bool) -> b let known_paths: Rc> = Default::default(); eval.strict = args.strict; - eval.io_handle = Box::new(nix_compat::NixCompatIO::new(known_paths.clone())); + eval.io_handle = Box::new(tvix_io::TvixIO::new( + known_paths.clone(), + nix_compat::NixCompatIO::new(), + )); // bundle fetchurl.nix (used in nixpkgs) by resolving to // `/__corepkgs__`, which has special handling in [`nix_compat`]. -- cgit 1.4.1