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/cli/src | |
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/cli/src')
-rw-r--r-- | tvix/cli/src/nix_compat.rs | 6 | ||||
-rw-r--r-- | tvix/cli/src/tvix_io.rs | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tvix/cli/src/nix_compat.rs b/tvix/cli/src/nix_compat.rs index ce352f0a964c..b322886c9e20 100644 --- a/tvix/cli/src/nix_compat.rs +++ b/tvix/cli/src/nix_compat.rs @@ -47,7 +47,7 @@ impl EvalIO for NixCompatIO { } // Pass the rest of the functions through to `Self::underlying` - fn path_exists(&mut self, path: PathBuf) -> Result<bool, io::Error> { + fn path_exists(&mut self, path: &Path) -> Result<bool, io::Error> { if path.starts_with("/__corepkgs__") { return Ok(true); } @@ -55,7 +55,7 @@ impl EvalIO for NixCompatIO { self.underlying.path_exists(path) } - fn read_to_string(&mut self, path: PathBuf) -> Result<String, io::Error> { + fn read_to_string(&mut self, path: &Path) -> Result<String, io::Error> { // Bundled version of corepkgs/fetchurl.nix. This workaround // is similar to what cppnix does for passing the path // through. @@ -69,7 +69,7 @@ impl EvalIO for NixCompatIO { self.underlying.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> { self.underlying.read_dir(path) } } diff --git a/tvix/cli/src/tvix_io.rs b/tvix/cli/src/tvix_io.rs index 5a3f5b0e7a1a..cc3278605572 100644 --- a/tvix/cli/src/tvix_io.rs +++ b/tvix/cli/src/tvix_io.rs @@ -48,7 +48,7 @@ impl<T: EvalIO> EvalIO for TvixIO<T> { Ok(imported_path) } - fn path_exists(&mut self, path: PathBuf) -> Result<bool, io::Error> { + fn path_exists(&mut self, path: &Path) -> Result<bool, io::Error> { if path.starts_with("/__corepkgs__") { return Ok(true); } @@ -56,7 +56,7 @@ impl<T: EvalIO> EvalIO for TvixIO<T> { self.actual.path_exists(path) } - fn read_to_string(&mut self, path: PathBuf) -> Result<String, io::Error> { + fn read_to_string(&mut self, path: &Path) -> Result<String, io::Error> { // Bundled version of corepkgs/fetchurl.nix. The counterpart // of this happens in `main`, where the `nix_path` of the // evaluation has `nix=/__corepkgs__` added to it. @@ -73,7 +73,7 @@ impl<T: EvalIO> EvalIO for TvixIO<T> { self.actual.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> { self.actual.read_dir(path) } } |