From aa7bdc1199bfbb69091dda942a82812257e30bc4 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 9 Jun 2023 18:22:25 +0300 Subject: refactor(tvix/store): use Arc instead of Box This allows us to blob services without closing them before putting them in a box. We currently need to use Arc<_>, not Rc<_>, because the GRPC wrappers require Sync. Change-Id: I679c5f06b62304f5b0456cfefe25a0a881de7c84 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8738 Reviewed-by: tazjin Tested-by: BuildkiteCI Autosubmit: flokli --- tvix/cli/src/main.rs | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'tvix/cli') diff --git a/tvix/cli/src/main.rs b/tvix/cli/src/main.rs index 90e3e0d59a20..048eddc531bf 100644 --- a/tvix/cli/src/main.rs +++ b/tvix/cli/src/main.rs @@ -7,6 +7,7 @@ mod tvix_io; use std::cell::RefCell; use std::rc::Rc; +use std::sync::Arc; use std::{fs, path::PathBuf}; use clap::Parser; @@ -71,20 +72,14 @@ fn interpret(code: &str, path: Option, args: &Args, explain: bool) -> b eval.strict = args.strict; - let blob_service = MemoryBlobService::default(); - let directory_service = MemoryDirectoryService::default(); - let path_info_service = MemoryPathInfoService::new( - Box::new(blob_service.clone()), - Box::new(directory_service.clone()), - ); + let blob_service = Arc::new(MemoryBlobService::default()); + let directory_service = Arc::new(MemoryDirectoryService::default()); + let path_info_service = + MemoryPathInfoService::new(blob_service.clone(), directory_service.clone()); eval.io_handle = Box::new(tvix_io::TvixIO::new( known_paths.clone(), - tvix_store::TvixStoreIO::new( - Box::new(blob_service), - Box::new(directory_service), - path_info_service, - ), + tvix_store::TvixStoreIO::new(blob_service, directory_service, path_info_service), )); // bundle fetchurl.nix (used in nixpkgs) by resolving to -- cgit 1.4.1