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

feat(tvix/eval/io): allow &mut self in EvalIO

Browse source 
It's okay if these calls mutate some internal state inside an
implementation.

Change-Id: I12bb11bde0310778c3da1275696bf7de058863a3
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8571
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
Florian Klink 2023-05-14 19:55:17 +03:00 • committed by flokli
parent 46ca98a7a2
commit 8bd7ced1fb
5 changed files with 34 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -40,7 +40,7 @@ impl EvalIO for NixCompatIO {
}
// Pass path imports through to `nix-store --add`
fn import_path(&self, path: &Path) -> Result<PathBuf, ErrorKind> {
fn import_path(&mut self, path: &Path) -> Result<PathBuf, ErrorKind> {
let path = path.to_owned();
if let Some(path) = self.import_cache.borrow().get(&path) {
return Ok(path.to_path_buf());
@ -58,7 +58,7 @@ impl EvalIO for NixCompatIO {
}
// Pass the rest of the functions through to `Self::underlying`
fn path_exists(&self, path: PathBuf) -> Result<bool, ErrorKind> {
fn path_exists(&mut self, path: PathBuf) -> Result<bool, ErrorKind> {
if path.starts_with("/__corepkgs__") {
return Ok(true);
}
@ -66,7 +66,7 @@ impl EvalIO for NixCompatIO {
self.underlying.path_exists(path)
}
fn read_to_string(&self, path: PathBuf) -> Result<String, ErrorKind> {
fn read_to_string(&mut self, path: PathBuf) -> Result<String, ErrorKind> {
// Bundled version of corepkgs/fetchurl.nix. This workaround
// is similar to what cppnix does for passing the path
// through.
@ -80,7 +80,7 @@ impl EvalIO for NixCompatIO {
self.underlying.read_to_string(path)
}
fn read_dir(&self, path: PathBuf) -> Result<Vec<(SmolStr, FileType)>, ErrorKind> {
fn read_dir(&mut self, path: PathBuf) -> Result<Vec<(SmolStr, FileType)>, ErrorKind> {
self.underlying.read_dir(path)
}
}