From 4218e4dc0e5834f354b61e31aabc2cb4006d409c Mon Sep 17 00:00:00 2001 From: edef Date: Fri, 10 Nov 2023 18:32:40 +0000 Subject: feat(nix-compat/nixbase32): use data_encoding::DecodeError 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 Tested-by: BuildkiteCI --- tvix/nix-compat/src/nixhash/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tvix/nix-compat/src/nixhash') diff --git a/tvix/nix-compat/src/nixhash/mod.rs b/tvix/nix-compat/src/nixhash/mod.rs index d2c1d0bd2017..f699a4cd9524 100644 --- a/tvix/nix-compat/src/nixhash/mod.rs +++ b/tvix/nix-compat/src/nixhash/mod.rs @@ -92,7 +92,7 @@ pub enum Error { #[error("invalid base16 encoding: {0}")] InvalidBase16Encoding(data_encoding::DecodeError), #[error("invalid base32 encoding: {0}")] - InvalidBase32Encoding(nixbase32::Nixbase32DecodeError), + InvalidBase32Encoding(data_encoding::DecodeError), #[error("invalid base64 encoding: {0}")] InvalidBase64Encoding(data_encoding::DecodeError), #[error("conflicting hash algo: {0} (hash_algo) vs {1} (inline)")] -- cgit 1.4.1