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

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

View file

@ -48,13 +48,13 @@ pub trait EvalIO {
/// * `builtins.pathExists :: path -> bool`
fn path_exists(&self, path: &Path) -> io::Result<bool>;
/// Read the file at the specified path to a string.
/// Read the file at the specified path to a Vec<u8>.
///
/// This is used for the following language evaluation cases:
///
/// * `builtins.readFile :: path -> string`
/// * `builtins.import :: path -> any`
fn read_to_string(&self, path: &Path) -> io::Result<String>;
fn read_to_end(&self, path: &Path) -> io::Result<Vec<u8>>;
/// Read the directory at the specified path and return the names
/// of its entries associated with their [`FileType`].
@ -99,8 +99,8 @@ impl EvalIO for StdIO {
path.try_exists()
}
fn read_to_string(&self, path: &Path) -> io::Result<String> {
std::fs::read_to_string(path)
fn read_to_end(&self, path: &Path) -> io::Result<Vec<u8>> {
std::fs::read(path)
}
fn read_dir(&self, path: &Path) -> io::Result<Vec<(bytes::Bytes, FileType)>> {
@ -145,7 +145,7 @@ impl EvalIO for DummyIO {
))
}
fn read_to_string(&self, _: &Path) -> io::Result<String> {
fn read_to_end(&self, _: &Path) -> io::Result<Vec<u8>> {
Err(io::Error::new(
io::ErrorKind::Unsupported,
"I/O methods are not implemented in DummyIO",

View file

@ -429,7 +429,7 @@ where
let content = self
.io_handle
.as_ref()
.read_to_string(&path)
.read_to_end(&path)
.map_err(|e| ErrorKind::IO {
path: Some(path),
error: e.into(),