From 432222f098bfceb033e63e9a63687e35574457f9 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 19 Jul 2023 18:52:50 +0300 Subject: feat(tvix/store/proto): use Bytes instead of Vec Makes use of https://github.com/tokio-rs/prost/pull/341, which makes our bytes field cheaper to clone. It's a bit annoying to configure due to https://github.com/hyperium/tonic/issues/908, but the workaround does get the job done. Change-Id: I25714600b041bb5432d3adf5859b151e72b12778 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8975 Reviewed-by: raitobezarius Tested-by: BuildkiteCI Reviewed-by: tazjin Autosubmit: flokli --- tvix/store/src/nar/mod.rs | 6 +++--- tvix/store/src/nar/renderer.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tvix/store/src/nar') diff --git a/tvix/store/src/nar/mod.rs b/tvix/store/src/nar/mod.rs index 84a48ba5f6..5a8bc21ae9 100644 --- a/tvix/store/src/nar/mod.rs +++ b/tvix/store/src/nar/mod.rs @@ -13,13 +13,13 @@ pub enum RenderError { StoreError(crate::Error), #[error("unable to find directory {}, referred from {:?}", .0, .1)] - DirectoryNotFound(B3Digest, Vec), + DirectoryNotFound(B3Digest, bytes::Bytes), #[error("unable to find blob {}, referred from {:?}", BASE64.encode(.0), .1)] - BlobNotFound([u8; 32], Vec), + BlobNotFound([u8; 32], bytes::Bytes), #[error("unexpected size in metadata for blob {}, referred from {:?} returned, expected {}, got {}", BASE64.encode(.0), .1, .2, .3)] - UnexpectedBlobMeta([u8; 32], Vec, u32, u32), + UnexpectedBlobMeta([u8; 32], bytes::Bytes, u32, u32), #[error("failure using the NAR writer: {0}")] NARWriterError(std::io::Error), diff --git a/tvix/store/src/nar/renderer.rs b/tvix/store/src/nar/renderer.rs index e2119ae079..cc5af488ab 100644 --- a/tvix/store/src/nar/renderer.rs +++ b/tvix/store/src/nar/renderer.rs @@ -115,7 +115,7 @@ fn walk_node( None => { return Err(RenderError::DirectoryNotFound( digest, - proto_directory_node.name.to_owned(), + proto_directory_node.name.clone(), )) } Some(proto_directory) => { -- cgit 1.4.1