diff options
author | Florian Klink <flokli@flokli.de> | 2023-05-21T08·17+0300 |
---|---|---|
committer | flokli <flokli@flokli.de> | 2023-05-22T09·43+0000 |
commit | 11771a06aed715b5e7a921b879e9415ccad48711 (patch) | |
tree | 7240bc5d4117ae1530fce7f1855c90ebe756bca1 /tvix/eval/src/io.rs | |
parent | b4bb9062eaa14e654f51a20b7c94656f7cd49858 (diff) |
refactor(tvix/eval): use &Path instead of PathBuf r/6173
This allows getting rid of some clones in eval/src/vm/generators.rs. Change-Id: I330390307d3bcfeef19c98954c753ee55b1ccee3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8604 Autosubmit: flokli <flokli@flokli.de> Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
Diffstat (limited to 'tvix/eval/src/io.rs')
-rw-r--r-- | tvix/eval/src/io.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tvix/eval/src/io.rs b/tvix/eval/src/io.rs index 3299c92d1fdb..f14da723db90 100644 --- a/tvix/eval/src/io.rs +++ b/tvix/eval/src/io.rs @@ -33,14 +33,14 @@ pub enum FileType { /// Defines how filesystem interaction occurs inside of tvix-eval. pub trait EvalIO { /// Verify whether the file at the specified path exists. - fn path_exists(&mut self, path: PathBuf) -> Result<bool, io::Error>; + fn path_exists(&mut self, path: &Path) -> Result<bool, io::Error>; /// Read the file at the specified path to a string. - fn read_to_string(&mut self, path: PathBuf) -> Result<String, io::Error>; + fn read_to_string(&mut self, path: &Path) -> Result<String, io::Error>; /// Read the directory at the specified path and return the names /// of its entries associated with their [`FileType`]. - fn read_dir(&mut self, path: PathBuf) -> Result<Vec<(SmolStr, FileType)>, io::Error>; + fn read_dir(&mut self, path: &Path) -> Result<Vec<(SmolStr, FileType)>, io::Error>; /// Import the given path. What this means depends on the /// implementation, for example for a `std::io`-based @@ -65,15 +65,15 @@ pub struct StdIO; #[cfg(feature = "impure")] impl EvalIO for StdIO { - fn path_exists(&mut self, path: PathBuf) -> Result<bool, io::Error> { + fn path_exists(&mut self, path: &Path) -> Result<bool, io::Error> { path.try_exists() } - fn read_to_string(&mut self, path: PathBuf) -> Result<String, io::Error> { + fn read_to_string(&mut self, path: &Path) -> Result<String, io::Error> { std::fs::read_to_string(&path) } - fn read_dir(&mut self, path: PathBuf) -> Result<Vec<(SmolStr, FileType)>, io::Error> { + fn read_dir(&mut self, path: &Path) -> Result<Vec<(SmolStr, FileType)>, io::Error> { let mut result = vec![]; for entry in path.read_dir()? { @@ -108,21 +108,21 @@ impl EvalIO for StdIO { pub struct DummyIO; impl EvalIO for DummyIO { - fn path_exists(&mut self, _: PathBuf) -> Result<bool, io::Error> { + fn path_exists(&mut self, _: &Path) -> Result<bool, io::Error> { Err(io::Error::new( io::ErrorKind::Unsupported, "I/O methods are not implemented in DummyIO", )) } - fn read_to_string(&mut self, _: PathBuf) -> Result<String, io::Error> { + fn read_to_string(&mut self, _: &Path) -> Result<String, io::Error> { Err(io::Error::new( io::ErrorKind::Unsupported, "I/O methods are not implemented in DummyIO", )) } - fn read_dir(&mut self, _: PathBuf) -> Result<Vec<(SmolStr, FileType)>, io::Error> { + fn read_dir(&mut self, _: &Path) -> Result<Vec<(SmolStr, FileType)>, io::Error> { Err(io::Error::new( io::ErrorKind::Unsupported, "I/O methods are not implemented in DummyIO", |