fix(tvix/castore): use bstr for formatting names in errors r/6778

Much friendlier than either Base64 or raw byte slices.

Change-Id: I9b4cdd57c83ddc76c0be8103da4320207657a72b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9622
Reviewed-by: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI

1 files changed, 4 insertions, 4 deletions

diff --git a/tvix/castore/src/proto/mod.rs b/tvix/castore/src/proto/mod.rs
index ba3fcbceb1..66ed5b0f1f 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}")]