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

refactor(tvix/eval): use EvalIO::path_exists for the builtin

Browse source 
Change-Id: I49822ce30137777865e7370ee86666636e277b35
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7573
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
This commit is contained in:
Vincent Ambo 2022-12-12 19:36:45 +03:00 committed by tazjin
parent ec3e38c2d6
commit 51deadd983
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tvix/eval/src/builtins/impure.rs
View file

@ -28,7 +28,8 @@ mod impure_builtins {
#[builtin("pathExists")] #[builtin("pathExists")]
fn builtin_path_exists(vm: &mut VM, s: Value) -> Result<Value, ErrorKind> { fn builtin_path_exists(vm: &mut VM, s: Value) -> Result<Value, ErrorKind> {
Ok(coerce_value_to_path(&s, vm)?.exists().into()) let path = coerce_value_to_path(&s, vm)?;
vm.io().path_exists(path).map(Value::Bool)
} }
#[builtin("readDir")] #[builtin("readDir")]

17
tvix/eval/src/io.rs
View file

@ -21,6 +21,9 @@ use crate::errors::ErrorKind;
/// Defines how filesystem interaction occurs inside of tvix-eval. /// Defines how filesystem interaction occurs inside of tvix-eval.
pub trait EvalIO { pub trait EvalIO {
/// Verify whether the file at the specified path exists.
fn path_exists(&self, path: PathBuf) -> Result<bool, ErrorKind>;
/// Read the file at the specified path to a string. /// Read the file at the specified path to a string.
fn read_to_string(&self, path: PathBuf) -> Result<String, ErrorKind>; fn read_to_string(&self, path: PathBuf) -> Result<String, ErrorKind>;
} }
@ -32,8 +35,14 @@ pub struct StdIO;
#[cfg(feature = "impure")] #[cfg(feature = "impure")]
impl EvalIO for StdIO { impl EvalIO for StdIO {
fn path_exists(&self, path: PathBuf) -> Result<bool, ErrorKind> {
path.try_exists().map_err(|e| ErrorKind::IO {
path: Some(path),
error: std::rc::Rc::new(e),
})
}
fn read_to_string(&self, path: PathBuf) -> Result<String, ErrorKind> { fn read_to_string(&self, path: PathBuf) -> Result<String, ErrorKind> {
let path: PathBuf = path.into();
std::fs::read_to_string(&path).map_err(|e| ErrorKind::IO { std::fs::read_to_string(&path).map_err(|e| ErrorKind::IO {
path: Some(path), path: Some(path),
error: std::rc::Rc::new(e), error: std::rc::Rc::new(e),
@ -46,6 +55,12 @@ impl EvalIO for StdIO {
pub struct DummyIO; pub struct DummyIO;
impl EvalIO for DummyIO { impl EvalIO for DummyIO {
fn path_exists(&self, _: PathBuf) -> Result<bool, ErrorKind> {
Err(ErrorKind::NotImplemented(
"I/O methods are not implemented in DummyIO",
))
}
fn read_to_string(&self, _: PathBuf) -> Result<String, ErrorKind> { fn read_to_string(&self, _: PathBuf) -> Result<String, ErrorKind> {
Err(ErrorKind::NotImplemented( Err(ErrorKind::NotImplemented(
"I/O methods are not implemented in DummyIO", "I/O methods are not implemented in DummyIO",