From 4c3ba46ba36b2fa2d9079fcc92ef27875f26418b Mon Sep 17 00:00:00 2001 From: Ryan Lahfa Date: Mon, 8 Jan 2024 09:50:13 +0100 Subject: refactor(tvix/store): `import_path` → `import_path_as_nar_ca` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add multiple additional helpers such as: - `path_to_name`: derive the basename of a given path - `derive_nar_ca_path_info`: derive the `PathInfo` for a content addressed NAR which isolates further the tree walking feature and the ingestion feature. Additionally, we don't `expect` anymore and propagate properly ingestion errors up. Change-Id: I60edb5b633911c58ade7e19f5002e6f75f90e262 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10574 Reviewed-by: flokli Tested-by: BuildkiteCI Autosubmit: raitobezarius --- tvix/glue/src/tvix_store_io.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tvix/glue') diff --git a/tvix/glue/src/tvix_store_io.rs b/tvix/glue/src/tvix_store_io.rs index c72b5d1085..45bcf0df3a 100644 --- a/tvix/glue/src/tvix_store_io.rs +++ b/tvix/glue/src/tvix_store_io.rs @@ -274,7 +274,7 @@ impl EvalIO for TvixStoreIO { #[instrument(skip(self), ret, err)] fn import_path(&self, path: &Path) -> io::Result { let output_path = self.tokio_handle.block_on(async { - tvix_store::utils::import_path( + tvix_store::import::import_path_as_nar_ca( path, &self.blob_service, &self.directory_service, -- cgit 1.4.1