mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/eval): allow reading non-UTF8 files

Browse source 
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<u8>.

Change-Id: I87f0291dc855a132689576559c891d66c30ddf2b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11003
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: Pádraic Ó Mhuiris <patrick.morris.310@gmail.com>
Reviewed-by: flokli <flokli@flokli.de>
This commit is contained in:
Florian Klink 2024-02-21 20:39:53 +07:00 • committed by flokli
parent 3e93efdc8c
commit 771200df7c
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tvix/glue/src/tvix_io.rs
View file

@ -44,7 +44,7 @@ where
self.actual.as_ref().path_exists(path)
}
fn read_to_string(&self, path: &Path) -> io::Result<String> {
fn read_to_end(&self, path: &Path) -> io::Result<Vec<u8>> {
// 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<Vec<(bytes::Bytes, FileType)>> {

10
tvix/glue/src/tvix_store_io.rs
View file

@ -371,7 +371,7 @@ impl EvalIO for TvixStoreIO {
}
#[instrument(skip(self), err)]
fn read_to_string(&self, path: &Path) -> io::Result<String> {
fn read_to_end(&self, path: &Path) -> io::Result<Vec<u8>> {
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)
}
}