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_io.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tvix/glue/src/tvix_io.rs') diff --git a/tvix/glue/src/tvix_io.rs b/tvix/glue/src/tvix_io.rs index 9fb9fbc37590..95146df7287e 100644 --- a/tvix/glue/src/tvix_io.rs +++ b/tvix/glue/src/tvix_io.rs @@ -44,7 +44,7 @@ where self.actual.as_ref().path_exists(path) } - fn read_to_string(&self, path: &Path) -> io::Result { + fn read_to_end(&self, path: &Path) -> io::Result> { // Bundled version of corepkgs/fetchurl.nix. The counterpart // of this happens in [crate::configure_nix_path], where the `nix_path` // of the evaluation has `nix=/__corepkgs__` added to it. @@ -55,10 +55,10 @@ where // TODO: this comparison is bad and allocates, we should use // the sane path library. if path.starts_with("/__corepkgs__/fetchurl.nix") { - return Ok(include_str!("fetchurl.nix").to_string()); + return Ok(include_bytes!("fetchurl.nix").to_vec()); } - self.actual.as_ref().read_to_string(path) + self.actual.as_ref().read_to_end(path) } fn read_dir(&self, path: &Path) -> io::Result> { -- cgit 1.4.1