diff options
author | Florian Klink <flokli@flokli.de> | 2023-05-25T05·34+0300 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2023-05-25T11·11+0000 |
commit | d25962b9a4d175faaf4ea9e08062036c0a3e0236 (patch) | |
tree | 8803d9ded12f0f4caf607e06e7b1d7f1b7d3bd0b /tvix/cli/src/nix_compat.rs | |
parent | ea48481eb39ded96fbaeef5d8e25771197eedda2 (diff) |
refactor(tvix/eval): stop borrowing &mut self r/6202
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>
Diffstat (limited to 'tvix/cli/src/nix_compat.rs')
-rw-r--r-- | tvix/cli/src/nix_compat.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tvix/cli/src/nix_compat.rs b/tvix/cli/src/nix_compat.rs index 0da3aeb21262..bda238983839 100644 --- a/tvix/cli/src/nix_compat.rs +++ b/tvix/cli/src/nix_compat.rs @@ -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) } } |