diff options
Diffstat (limited to '')
-rw-r--r-- | tvix/cli/src/nix_compat.rs | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/tvix/cli/src/nix_compat.rs b/tvix/cli/src/nix_compat.rs index 4141e0a21759..ce352f0a964c 100644 --- a/tvix/cli/src/nix_compat.rs +++ b/tvix/cli/src/nix_compat.rs @@ -11,7 +11,7 @@ use std::process::Command; use std::{io, path::PathBuf}; use smol_str::SmolStr; -use tvix_eval::{ErrorKind, EvalIO, FileType, StdIO}; +use tvix_eval::{EvalIO, FileType, StdIO}; /// Compatibility implementation of [`EvalIO`] that uses C++ Nix to /// write files to the Nix store. @@ -33,16 +33,13 @@ impl EvalIO for NixCompatIO { } // Pass path imports through to `nix-store --add` - fn import_path(&mut self, path: &Path) -> Result<PathBuf, ErrorKind> { + fn import_path(&mut self, path: &Path) -> Result<PathBuf, io::Error> { let path = path.to_owned(); if let Some(path) = self.import_cache.get(&path) { return Ok(path.to_path_buf()); } - let store_path = self.add_to_store(&path).map_err(|error| ErrorKind::IO { - error: std::rc::Rc::new(error), - path: Some(path.to_path_buf()), - })?; + let store_path = self.add_to_store(&path)?; self.import_cache.insert(path, store_path.clone()); @@ -50,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, ErrorKind> { + fn path_exists(&mut self, path: PathBuf) -> Result<bool, io::Error> { if path.starts_with("/__corepkgs__") { return Ok(true); } @@ -58,7 +55,7 @@ impl EvalIO for NixCompatIO { self.underlying.path_exists(path) } - fn read_to_string(&mut self, path: PathBuf) -> Result<String, ErrorKind> { + fn read_to_string(&mut self, path: PathBuf) -> Result<String, io::Error> { // Bundled version of corepkgs/fetchurl.nix. This workaround // is similar to what cppnix does for passing the path // through. @@ -72,7 +69,7 @@ impl EvalIO for NixCompatIO { self.underlying.read_to_string(path) } - fn read_dir(&mut self, path: PathBuf) -> Result<Vec<(SmolStr, FileType)>, ErrorKind> { + fn read_dir(&mut self, path: PathBuf) -> Result<Vec<(SmolStr, FileType)>, io::Error> { self.underlying.read_dir(path) } } |