about summary refs log tree commit diff
path: root/tvix/glue/src
diff options
context:
space:
mode:
authorConnor Brewster <cbrewster@hey.com>2024-04-21T22·40-0500
committerclbot <clbot@tvl.fyi>2024-04-24T15·41+0000
commitd2e67f021ecb54435d5ac57aa431364417eb59fa (patch)
tree84e23282225675365b64d7415fd2793e95be5aeb /tvix/glue/src
parent79698c470cf9e043204741b727ce34041fcb1e32 (diff)
refactor(tvix/castore): add separate Error enum for archives r/8002
The `Error` enum for the `imports` crate has both filesystem and archive
specific errors and was starting to get messy.

This adds a separate `Error` enum for archive-specific errors and then
keeps a single `Archive` variant in the top-level import `Error` for all
archive errors.

Change-Id: I4cd0746c864e5ec50b1aa68c0630ef9cd05176c7
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11498
Tested-by: BuildkiteCI
Autosubmit: Connor Brewster <cbrewster@hey.com>
Reviewed-by: flokli <flokli@flokli.de>
Diffstat (limited to 'tvix/glue/src')
-rw-r--r--tvix/glue/src/builtins/errors.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/tvix/glue/src/builtins/errors.rs b/tvix/glue/src/builtins/errors.rs
index 5e36bc1a243f..c05d366f135b 100644
--- a/tvix/glue/src/builtins/errors.rs
+++ b/tvix/glue/src/builtins/errors.rs
@@ -54,6 +54,9 @@ pub enum FetcherError {
     #[error(transparent)]
     Import(#[from] tvix_castore::import::Error),
 
+    #[error(transparent)]
+    ImportArchive(#[from] tvix_castore::import::archive::Error),
+
     #[error("Error calculating store path for fetcher output: {0}")]
     StorePath(#[from] BuildStorePathError),
 }