about summary refs log tree commit diff
path: root/tvix/cli
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2023-05-25T14·52+0300
committerclbot <clbot@tvl.fyi>2023-06-12T10·15+0000
commit27ff98000b0cdf0ed30eb8837c7d44cd3e79d32f (patch)
tree09fcb40135001d35717ce176d8b473f5e634bdcf /tvix/cli
parent5139cc45c2ce1736509f3f0ebf68a71c10ace939 (diff)
feat(tvix/store): eliminate generics in BlobStore r/6269
To construct various stores at runtime, we need to eliminate associated
types from the BlobService trait, and return Box<dyn …> instead of
specific types.

This also means we can't consume self in the close() method, so
everything we write to is put in an Option<>, and during the first close
we take from there.

Change-Id: Ia523b6ab2f2a5276f51cb5d17e81a5925bce69b6
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8647
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Diffstat (limited to 'tvix/cli')
-rw-r--r--tvix/cli/src/main.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/tvix/cli/src/main.rs b/tvix/cli/src/main.rs
index 28b75dd907aa..459177717c5a 100644
--- a/tvix/cli/src/main.rs
+++ b/tvix/cli/src/main.rs
@@ -75,14 +75,14 @@ fn interpret(code: &str, path: Option<PathBuf>, args: &Args, explain: bool) -> b
     let directory_service = MemoryDirectoryService::default();
     let path_info_service = MemoryPathInfoService::default();
     let nar_calculation_service = tvix_store::nar::NonCachingNARCalculationService::new(
-        blob_service.clone(),
+        Box::new(blob_service.clone()),
         directory_service.clone(),
     );
 
     eval.io_handle = Box::new(tvix_io::TvixIO::new(
         known_paths.clone(),
         tvix_store::TvixStoreIO::new(
-            blob_service,
+            Box::new(blob_service),
             directory_service,
             path_info_service,
             nar_calculation_service,