maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/eval): use &Path instead of PathBuf

Browse source 
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>
This commit is contained in:
Florian Klink 2023-05-21 11:17:34 +03:00 • committed by flokli
parent b4bb9062ea
commit 11771a06ae
5 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tvix/cli/src/nix_compat.rs
View file

@ -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)
}
}

6
tvix/cli/src/tvix_io.rs
View file

@ -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)
}
}