diff options
author | Florian Klink <flokli@flokli.de> | 2023-12-12T13·44+0200 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2023-12-12T14·28+0000 |
commit | 27c07b72c64cba129cc42507fb5e26398031924d (patch) | |
tree | 7d26c2a3957c085aedc7881324d97fccdb16b117 /tvix/glue | |
parent | ad566999ca81e5d584acb5107e327a1aec9fdd5a (diff) |
refactor(tvix): use io::Result for EvalIO r/7170
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>
Diffstat (limited to '')
-rw-r--r-- | tvix/glue/src/tvix_io.rs | 8 | ||||
-rw-r--r-- | tvix/glue/src/tvix_store_io.rs | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tvix/glue/src/tvix_io.rs b/tvix/glue/src/tvix_io.rs index 09e1417a2157..52bbd7bc9cda 100644 --- a/tvix/glue/src/tvix_io.rs +++ b/tvix/glue/src/tvix_io.rs @@ -40,7 +40,7 @@ impl<T: EvalIO> EvalIO for TvixIO<T> { self.actual.store_dir() } - fn import_path(&self, path: &Path) -> Result<PathBuf, io::Error> { + fn import_path(&self, path: &Path) -> io::Result<PathBuf> { let imported_path = self.actual.import_path(path)?; self.known_paths .borrow_mut() @@ -49,7 +49,7 @@ impl<T: EvalIO> EvalIO for TvixIO<T> { Ok(imported_path) } - fn path_exists(&self, path: &Path) -> Result<bool, io::Error> { + fn path_exists(&self, path: &Path) -> io::Result<bool> { if path.starts_with("/__corepkgs__") { return Ok(true); } @@ -57,7 +57,7 @@ impl<T: EvalIO> EvalIO for TvixIO<T> { self.actual.path_exists(path) } - fn read_to_string(&self, path: &Path) -> Result<String, io::Error> { + fn read_to_string(&self, path: &Path) -> io::Result<String> { // Bundled version of corepkgs/fetchurl.nix. The counterpart // of this happens in [crate::configure_nix_path], where the `nix_path` // of the evaluation has `nix=/__corepkgs__` added to it. @@ -74,7 +74,7 @@ impl<T: EvalIO> EvalIO for TvixIO<T> { self.actual.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)>> { self.actual.read_dir(path) } } diff --git a/tvix/glue/src/tvix_store_io.rs b/tvix/glue/src/tvix_store_io.rs index 3cd59d559aa0..9073aeeb3ebb 100644 --- a/tvix/glue/src/tvix_store_io.rs +++ b/tvix/glue/src/tvix_store_io.rs @@ -59,7 +59,7 @@ impl TvixStoreIO { &self, store_path: &StorePath, sub_path: &Path, - ) -> Result<Option<Node>, io::Error> { + ) -> io::Result<Option<Node>> { let path_info_service = self.path_info_service.clone(); let task = self.tokio_handle.spawn({ let digest = *store_path.digest(); @@ -102,7 +102,7 @@ impl TvixStoreIO { impl EvalIO for TvixStoreIO { #[instrument(skip(self), ret, err)] - fn path_exists(&self, path: &Path) -> Result<bool, io::Error> { + fn path_exists(&self, path: &Path) -> io::Result<bool> { if let Ok((store_path, sub_path)) = StorePath::from_absolute_path_full(&path.to_string_lossy()) { @@ -123,7 +123,7 @@ impl EvalIO for TvixStoreIO { } #[instrument(skip(self), ret, err)] - fn read_to_string(&self, path: &Path) -> Result<String, io::Error> { + fn read_to_string(&self, path: &Path) -> io::Result<String> { if let Ok((store_path, sub_path)) = StorePath::from_absolute_path_full(&path.to_string_lossy()) { @@ -195,7 +195,7 @@ impl EvalIO for TvixStoreIO { } #[instrument(skip(self), ret, err)] - 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)>> { if let Ok((store_path, sub_path)) = StorePath::from_absolute_path_full(&path.to_string_lossy()) { @@ -263,7 +263,7 @@ impl EvalIO for TvixStoreIO { } #[instrument(skip(self), ret, err)] - fn import_path(&self, path: &std::path::Path) -> Result<PathBuf, std::io::Error> { + fn import_path(&self, path: &std::path::Path) -> io::Result<PathBuf> { let p = path.to_owned(); let blob_service = self.blob_service.clone(); let directory_service = self.directory_service.clone(); @@ -307,7 +307,7 @@ async fn import_path_with_pathinfo( directory_service: Arc<dyn DirectoryService>, path_info_service: Arc<dyn PathInfoService>, path: &std::path::Path, -) -> Result<PathInfo, io::Error> { +) -> io::Result<PathInfo> { // Call [import::ingest_path], which will walk over the given path and return a root_node. let root_node = import::ingest_path(blob_service.clone(), directory_service.clone(), path) .await |