diff options
| author | Florian Klink <flokli@flokli.de> | 2023-07-19T15·52+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-07-22T09·03+0000 |
| commit | 432222f098bfceb033e63e9a63687e35574457f9 (patch) | |
| tree | 43a5e38cf79827dd63aa2adbd841da6aa62cf1de /tvix/eval/src/io.rs | |
| parent | 7971d7d9ff42ed00f6f70121f372dd744f45915b (diff) | |
feat(tvix/store/proto): use Bytes instead of Vec<u8> r/6439
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 <tvl@lahfa.xyz> Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su> Autosubmit: flokli <flokli@flokli.de>
Diffstat (limited to 'tvix/eval/src/io.rs')
| -rw-r--r-- | tvix/eval/src/io.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tvix/eval/src/io.rs b/tvix/eval/src/io.rs index de3da9ebe8ec..1baa24439e4a 100644 --- a/tvix/eval/src/io.rs +++ b/tvix/eval/src/io.rs @@ -42,7 +42,7 @@ pub trait EvalIO { /// Read the directory at the specified path and return the names /// of its entries associated with their [`FileType`]. - fn read_dir(&self, path: &Path) -> Result<Vec<(Vec<u8>, FileType)>, io::Error>; + fn read_dir(&self, path: &Path) -> Result<Vec<(bytes::Bytes, FileType)>, io::Error>; /// Import the given path. What this means depends on the /// implementation, for example for a `std::io`-based @@ -76,7 +76,7 @@ impl EvalIO for StdIO { std::fs::read_to_string(&path) } - fn read_dir(&self, path: &Path) -> Result<Vec<(Vec<u8>, FileType)>, io::Error> { + fn read_dir(&self, path: &Path) -> Result<Vec<(bytes::Bytes, FileType)>, io::Error> { let mut result = vec![]; for entry in path.read_dir()? { @@ -93,7 +93,7 @@ impl EvalIO for StdIO { FileType::Unknown }; - result.push((entry.file_name().into_vec(), val)) + result.push((entry.file_name().into_vec().into(), val)) } Ok(result) @@ -125,7 +125,7 @@ impl EvalIO for DummyIO { )) } - fn read_dir(&self, _: &Path) -> Result<Vec<(Vec<u8>, FileType)>, io::Error> { + fn read_dir(&self, _: &Path) -> Result<Vec<(bytes::Bytes, FileType)>, io::Error> { Err(io::Error::new( io::ErrorKind::Unsupported, "I/O methods are not implemented in DummyIO", |