From 27c07b72c64cba129cc42507fb5e26398031924d Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 12 Dec 2023 15:44:30 +0200
Subject: refactor(tvix): use io::Result for EvalIO

This is just a alias for Result<_, io::Error>, but shorter.

Change-Id: I7c22f61b85e3014885a747b5c1e5abd11b0ef17d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10327
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
---
 tvix/eval/src/io.rs | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'tvix/eval')

diff --git a/tvix/eval/src/io.rs b/tvix/eval/src/io.rs
index 26b9337df037..ccbc7dfdbcb0 100644
--- a/tvix/eval/src/io.rs
+++ b/tvix/eval/src/io.rs
@@ -46,7 +46,7 @@ pub trait EvalIO {
     /// * checking whether a file added to the `NIX_PATH` actually exists when
     ///   it is referenced in `<...>` brackets.
     /// * `builtins.pathExists :: path -> bool`
-    fn path_exists(&self, path: &Path) -> Result<bool, io::Error>;
+    fn path_exists(&self, path: &Path) -> io::Result<bool>;
 
     /// Read the file at the specified path to a string.
     ///
@@ -54,7 +54,7 @@ pub trait EvalIO {
     ///
     /// * `builtins.readFile :: path -> string`
     /// * `builtins.import :: path -> any`
-    fn read_to_string(&self, path: &Path) -> Result<String, io::Error>;
+    fn read_to_string(&self, path: &Path) -> io::Result<String>;
 
     /// Read the directory at the specified path and return the names
     /// of its entries associated with their [`FileType`].
@@ -62,7 +62,7 @@ pub trait EvalIO {
     /// This is used for the following language evaluation cases:
     ///
     /// * `builtins.readDir :: path -> attrs<filename, filetype>`
-    fn read_dir(&self, path: &Path) -> Result<Vec<(bytes::Bytes, FileType)>, io::Error>;
+    fn read_dir(&self, path: &Path) -> io::Result<Vec<(bytes::Bytes, FileType)>>;
 
     /// Import the given path. What this means depends on the implementation,
     /// for example for a `std::io`-based implementation this might be a no-op,
@@ -74,7 +74,7 @@ pub trait EvalIO {
     /// * string coercion of path literals (e.g. `/foo/bar`), which are expected
     ///   to return a path
     /// * `builtins.toJSON` on a path literal, also expected to return a path
-    fn import_path(&self, path: &Path) -> Result<PathBuf, io::Error>;
+    fn import_path(&self, path: &Path) -> io::Result<PathBuf>;
 
     /// Returns the root of the store directory, if such a thing
     /// exists in the evaluation context.
@@ -95,15 +95,15 @@ pub struct StdIO;
 // TODO: we might want to make this whole impl to be target_family = "unix".
 #[cfg(feature = "impure")]
 impl EvalIO for StdIO {
-    fn path_exists(&self, path: &Path) -> Result<bool, io::Error> {
+    fn path_exists(&self, path: &Path) -> io::Result<bool> {
         path.try_exists()
     }
 
-    fn read_to_string(&self, path: &Path) -> Result<String, io::Error> {
+    fn read_to_string(&self, path: &Path) -> io::Result<String> {
         std::fs::read_to_string(path)
     }
 
-    fn read_dir(&self, path: &Path) -> Result<Vec<(bytes::Bytes, FileType)>, io::Error> {
+    fn read_dir(&self, path: &Path) -> io::Result<Vec<(bytes::Bytes, FileType)>> {
         let mut result = vec![];
 
         for entry in path.read_dir()? {
@@ -128,7 +128,7 @@ impl EvalIO for StdIO {
 
     // this is a no-op for `std::io`, as the user can already refer to
     // the path directly
-    fn import_path(&self, path: &Path) -> Result<PathBuf, io::Error> {
+    fn import_path(&self, path: &Path) -> io::Result<PathBuf> {
         Ok(path.to_path_buf())
     }
 }
@@ -138,28 +138,28 @@ impl EvalIO for StdIO {
 pub struct DummyIO;
 
 impl EvalIO for DummyIO {
-    fn path_exists(&self, _: &Path) -> Result<bool, io::Error> {
+    fn path_exists(&self, _: &Path) -> io::Result<bool> {
         Err(io::Error::new(
             io::ErrorKind::Unsupported,
             "I/O methods are not implemented in DummyIO",
         ))
     }
 
-    fn read_to_string(&self, _: &Path) -> Result<String, io::Error> {
+    fn read_to_string(&self, _: &Path) -> io::Result<String> {
         Err(io::Error::new(
             io::ErrorKind::Unsupported,
             "I/O methods are not implemented in DummyIO",
         ))
     }
 
-    fn read_dir(&self, _: &Path) -> Result<Vec<(bytes::Bytes, FileType)>, io::Error> {
+    fn read_dir(&self, _: &Path) -> io::Result<Vec<(bytes::Bytes, FileType)>> {
         Err(io::Error::new(
             io::ErrorKind::Unsupported,
             "I/O methods are not implemented in DummyIO",
         ))
     }
 
-    fn import_path(&self, _: &Path) -> Result<PathBuf, io::Error> {
+    fn import_path(&self, _: &Path) -> io::Result<PathBuf> {
         Err(io::Error::new(
             io::ErrorKind::Unsupported,
             "I/O methods are not implemented in DummyIO",
-- 
cgit 1.4.1