diff options
Diffstat (limited to 'tvix/castore')
| -rw-r--r-- | tvix/castore/Cargo.toml | 1 | ||||
| -rw-r--r-- | tvix/castore/src/proto/mod.rs | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tvix/castore/Cargo.toml b/tvix/castore/Cargo.toml index 4dab3bfa4469..69da905a8777 100644 --- a/tvix/castore/Cargo.toml +++ b/tvix/castore/Cargo.toml @@ -22,6 +22,7 @@ tower = "0.4.13" tracing = "0.1.37" url = "2.4.0" walkdir = "2.4.0" +bstr = "1.6.0" [dependencies.tonic-reflection] optional = true diff --git a/tvix/castore/src/proto/mod.rs b/tvix/castore/src/proto/mod.rs index ba3fcbceb14d..66ed5b0f1f89 100644 --- a/tvix/castore/src/proto/mod.rs +++ b/tvix/castore/src/proto/mod.rs @@ -1,6 +1,6 @@ #![allow(clippy::derive_partial_eq_without_eq, non_snake_case)] // https://github.com/hyperium/tonic/issues/1056 -use data_encoding::BASE64; +use bstr::ByteSlice; use std::{collections::HashSet, iter::Peekable}; use thiserror::Error; @@ -29,13 +29,13 @@ mod tests; #[derive(Debug, PartialEq, Eq, Error)] pub enum ValidateDirectoryError { /// Elements are not in sorted order - #[error("{} is not sorted", std::str::from_utf8(.0).unwrap_or(&BASE64.encode(.0)))] + #[error("{:?} is not sorted", .0.as_bstr())] WrongSorting(Vec<u8>), /// Multiple elements with the same name encountered - #[error("{0:?} is a duplicate name")] + #[error("{:?} is a duplicate name", .0.as_bstr())] DuplicateName(Vec<u8>), /// Invalid name encountered - #[error("Invalid name in {0:?}")] + #[error("Invalid name in {:?}", .0.as_bstr())] InvalidName(Vec<u8>), /// Invalid digest length encountered #[error("Invalid Digest length: {0}")] |