diff options
| author | edef <edef@edef.eu> | 2023-11-10T18·32+0000 |
|---|---|---|
| committer | edef <edef@edef.eu> | 2023-11-10T19·05+0000 |
| commit | 4218e4dc0e5834f354b61e31aabc2cb4006d409c (patch) | |
| tree | 9635b288c82b63fb16101be0ab7146d57c51d7c3 /tvix/nix-compat/src/store_path/mod.rs | |
| parent | 7e317cfded5a5eab86111ad485816c3179a34546 (diff) | |
feat(nix-compat/nixbase32): use data_encoding::DecodeError r/6983
Rather than having our own error type, just make decoding errors use the same common error type. Change-Id: Ie2c86972f3745c695253adc3214444ac0ab8db6e Reviewed-on: https://cl.tvl.fyi/c/depot/+/9995 Reviewed-by: flokli <flokli@flokli.de> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/nix-compat/src/store_path/mod.rs')
| -rw-r--r-- | tvix/nix-compat/src/store_path/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tvix/nix-compat/src/store_path/mod.rs b/tvix/nix-compat/src/store_path/mod.rs index fe4cf9f583..3eb8877d6e 100644 --- a/tvix/nix-compat/src/store_path/mod.rs +++ b/tvix/nix-compat/src/store_path/mod.rs @@ -1,5 +1,5 @@ -use crate::nixbase32::{self, Nixbase32DecodeError}; -use data_encoding::BASE64; +use crate::nixbase32; +use data_encoding::{DecodeError, BASE64}; use std::{ fmt, path::PathBuf, @@ -28,7 +28,7 @@ pub enum Error { #[error("Dash is missing between hash and name")] MissingDash, #[error("Hash encoding is invalid: {0}")] - InvalidHashEncoding(Nixbase32DecodeError), + InvalidHashEncoding(DecodeError), #[error("Invalid length")] InvalidLength, #[error( |