diff options
Diffstat (limited to 'tvix/eval')
| -rw-r--r-- | tvix/eval/src/io.rs | 10 | ||||
| -rw-r--r-- | tvix/eval/src/vm/generators.rs | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tvix/eval/src/io.rs b/tvix/eval/src/io.rs index ccbc7dfdbcb0..6589c0dc5cae 100644 --- a/tvix/eval/src/io.rs +++ b/tvix/eval/src/io.rs @@ -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", diff --git a/tvix/eval/src/vm/generators.rs b/tvix/eval/src/vm/generators.rs index fba4e7cd90d2..2a2710dc34af 100644 --- a/tvix/eval/src/vm/generators.rs +++ b/tvix/eval/src/vm/generators.rs @@ -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(), |