From 771200df7c311fc8b87a0a65a02e22a11d80cd66 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 21 Feb 2024 20:39:53 +0700 Subject: fix(tvix/eval): allow reading non-UTF8 files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With our values using bstr now, we're not restricted to only reading files that contain valid UTF-8. Update our `read_to_string` function to `read_to_end` (named like `std::io::Read::read_to_end`), and have it return a Vec. Change-Id: I87f0291dc855a132689576559c891d66c30ddf2b Reviewed-on: https://cl.tvl.fyi/c/depot/+/11003 Tested-by: BuildkiteCI Autosubmit: flokli Reviewed-by: Pádraic Ó Mhuiris Reviewed-by: flokli --- tvix/glue/src/tvix_store_io.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tvix/glue/src/tvix_store_io.rs') diff --git a/tvix/glue/src/tvix_store_io.rs b/tvix/glue/src/tvix_store_io.rs index 333b04b170..c09f0098e4 100644 --- a/tvix/glue/src/tvix_store_io.rs +++ b/tvix/glue/src/tvix_store_io.rs @@ -371,7 +371,7 @@ impl EvalIO for TvixStoreIO { } #[instrument(skip(self), err)] - fn read_to_string(&self, path: &Path) -> io::Result { + fn read_to_end(&self, path: &Path) -> io::Result> { if let Ok((store_path, sub_path)) = StorePath::from_absolute_path_full(&path.to_string_lossy()) { @@ -416,9 +416,9 @@ impl EvalIO for TvixStoreIO { } }; - let mut buf = String::new(); + let mut buf = Vec::new(); - reader.read_to_string(&mut buf).await?; + reader.read_to_end(&mut buf).await?; Ok(buf) }) } @@ -430,11 +430,11 @@ impl EvalIO for TvixStoreIO { } else { // As tvix-store doesn't manage /nix/store on the filesystem, // we still need to also ask self.std_io here. - self.std_io.read_to_string(path) + self.std_io.read_to_end(path) } } else { // The store path is no store path, so do regular StdIO. - self.std_io.read_to_string(path) + self.std_io.read_to_end(path) } } -- cgit 1.4.1