maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix): use io::Result for EvalIO

Browse source 
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>
This commit is contained in:
Florian Klink 2023-12-12 15:44:30 +02:00 • committed by clbot
parent ad566999ca
commit 27c07b72c6
3 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tvix/glue/src/tvix_io.rs
View file

@ -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)
}
}

12
tvix/glue/src/tvix_store_io.rs
View file

@ -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