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

refactor(tvix/eval): stop borrowing &mut self

Browse source 
This does undo cl/8571.

Change-Id: Ib14b4e7404f906e346304b6113860ae811afc94a
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8631
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: flokli <flokli@flokli.de>
This commit is contained in:
Florian Klink 2023-05-25 08:34:00 +03:00 • committed by clbot
parent ea48481eb3
commit d25962b9a4
4 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,7 +34,7 @@ impl EvalIO for NixCompatIO {
}
// Pass path imports through to `nix-store --add`
fn import_path(&mut self, path: &Path) -> Result<PathBuf, io::Error> {
fn import_path(&self, path: &Path) -> Result<PathBuf, io::Error> {
let path = path.to_owned();
if let Some(path) = self
.import_cache
@ -56,7 +56,7 @@ impl EvalIO for NixCompatIO {
}
// Pass the rest of the functions through to `Self::underlying`
fn path_exists(&mut self, path: &Path) -> Result<bool, io::Error> {
fn path_exists(&self, path: &Path) -> Result<bool, io::Error> {
if path.starts_with("/__corepkgs__") {
return Ok(true);
}
@ -64,7 +64,7 @@ impl EvalIO for NixCompatIO {
self.underlying.path_exists(path)
}
fn read_to_string(&mut self, path: &Path) -> Result<String, io::Error> {
fn read_to_string(&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.
@ -78,7 +78,7 @@ impl EvalIO for NixCompatIO {
self.underlying.read_to_string(path)
}
fn read_dir(&mut self, path: &Path) -> Result<Vec<(SmolStr, FileType)>, io::Error> {
fn read_dir(&self, path: &Path) -> Result<Vec<(SmolStr, FileType)>, io::Error> {
self.underlying.read_dir(path)
}
}

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

@ -39,7 +39,7 @@ impl<T: EvalIO> EvalIO for TvixIO<T> {
self.actual.store_dir()
}
fn import_path(&mut self, path: &Path) -> Result<PathBuf, io::Error> {
fn import_path(&self, path: &Path) -> Result<PathBuf, io::Error> {
let imported_path = self.actual.import_path(path)?;
self.known_paths
.borrow_mut()
@ -48,7 +48,7 @@ impl<T: EvalIO> EvalIO for TvixIO<T> {
Ok(imported_path)
}
fn path_exists(&mut self, path: &Path) -> Result<bool, io::Error> {
fn path_exists(&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: &Path) -> Result<String, io::Error> {
fn read_to_string(&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: &Path) -> Result<Vec<(SmolStr, FileType)>, io::Error> {
fn read_dir(&self, path: &Path) -> Result<Vec<(SmolStr, FileType)>, io::Error> {
self.actual.read_dir(path)
}
}