From 8b77c7fcd7e9af42dc5145aa9f781dd7c2f05506 Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 19 Jul 2024 15:22:48 +0200 Subject: refactor(tvix/store): use composition in tvix_store crate Change-Id: Ie6290b296baba2b987f1a61c9bb4c78549ac11f1 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11983 Reviewed-by: flokli Autosubmit: yuka Tested-by: BuildkiteCI --- tvix/glue/benches/eval.rs | 2 +- tvix/glue/src/builtins/mod.rs | 2 +- tvix/glue/src/tests/mod.rs | 2 +- tvix/glue/src/tvix_store_io.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tvix/glue') diff --git a/tvix/glue/benches/eval.rs b/tvix/glue/benches/eval.rs index 55f37f2d58ed..ee3d554dcbab 100644 --- a/tvix/glue/benches/eval.rs +++ b/tvix/glue/benches/eval.rs @@ -34,7 +34,7 @@ fn interpret(code: &str) { let tvix_store_io = Rc::new(TvixStoreIO::new( blob_service, directory_service, - path_info_service.into(), + path_info_service, nar_calculation_service.into(), Arc::::default(), TOKIO_RUNTIME.handle().clone(), diff --git a/tvix/glue/src/builtins/mod.rs b/tvix/glue/src/builtins/mod.rs index e1c20e461ffc..e1d1c9c84f25 100644 --- a/tvix/glue/src/builtins/mod.rs +++ b/tvix/glue/src/builtins/mod.rs @@ -80,7 +80,7 @@ mod tests { let io = Rc::new(TvixStoreIO::new( blob_service, directory_service, - path_info_service.into(), + path_info_service, nar_calculation_service.into(), Arc::::default(), runtime.handle().clone(), diff --git a/tvix/glue/src/tests/mod.rs b/tvix/glue/src/tests/mod.rs index 142ae1a07714..e9f21c32912e 100644 --- a/tvix/glue/src/tests/mod.rs +++ b/tvix/glue/src/tests/mod.rs @@ -41,7 +41,7 @@ fn eval_test(code_path: PathBuf, expect_success: bool) { let tvix_store_io = Rc::new(TvixStoreIO::new( blob_service, directory_service, - path_info_service.into(), + path_info_service, nar_calculation_service.into(), Arc::new(DummyBuildService::default()), tokio_runtime.handle().clone(), diff --git a/tvix/glue/src/tvix_store_io.rs b/tvix/glue/src/tvix_store_io.rs index e8c09af0ec4c..cfc037e8dada 100644 --- a/tvix/glue/src/tvix_store_io.rs +++ b/tvix/glue/src/tvix_store_io.rs @@ -648,7 +648,7 @@ mod tests { let io = Rc::new(TvixStoreIO::new( blob_service, directory_service, - path_info_service.into(), + path_info_service, nar_calculation_service.into(), Arc::::default(), tokio_runtime.handle().clone(), -- cgit 1.4.1