diff options
author | Matthias Schiffer <mschiffer@universe-factory.net> | 2021-09-06 00:34:41 +0200 |
---|---|---|
committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2021-09-06 00:34:41 +0200 |
commit | e69aaa83e917128593ca1de43307776939716fab (patch) | |
tree | 1f13dde8f2256d2cdbf7a92673bc9495014675a8 /src/runner/runc/run.rs | |
parent | c56cf1cfd599b764946c1cc1c8407c4167e595d1 (diff) | |
download | rebel-e69aaa83e917128593ca1de43307776939716fab.tar rebel-e69aaa83e917128593ca1de43307776939716fab.zip |
util: remove ToIOResult
Not needed anymore with the current nix version.
Diffstat (limited to 'src/runner/runc/run.rs')
-rw-r--r-- | src/runner/runc/run.rs | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/runner/runc/run.rs b/src/runner/runc/run.rs index 84e898a..cfb1364 100644 --- a/src/runner/runc/run.rs +++ b/src/runner/runc/run.rs @@ -13,7 +13,7 @@ use tee_readwrite::TeeWriter; use crate::{ paths, runner, types::*, - util::{self, tar, ToIOResult}, + util::{self, tar}, }; use super::spec; @@ -42,7 +42,7 @@ impl From<Error> for io::Error { } } -fn init_task(task: &runner::Task) -> Result<(), Error> { +fn init_task(task: &runner::Task) -> io::Result<()> { let mut dir = fs::DirBuilder::new(); dir.recursive(true); @@ -73,13 +73,12 @@ fn init_task(task: &runner::Task) -> Result<(), Error> { Some("none"), MsFlags::MS_BIND, None, - ) - .to_io_result()?; + )?; Ok(()) } -fn unpack_dependencies(task: &runner::Task) -> Result<(), Error> { +fn unpack_dependencies(task: &runner::Task) -> io::Result<()> { let task_tmp_dir = paths::task_tmp_dir(&task.input_hash); for (dep, action) in &task.depends { match action { @@ -115,7 +114,7 @@ fn unpack_dependencies(task: &runner::Task) -> Result<(), Error> { Ok(()) } -fn collect_output(task: runner::Task) -> Result<OutputHash, io::Error> { +fn collect_output(task: runner::Task) -> io::Result<OutputHash> { let filename = paths::output_tmp_filename(&task.input_hash); let file = File::create(&filename)?; let hasher = OutputHasher::new(); @@ -135,8 +134,7 @@ fn collect_output(task: runner::Task) -> Result<OutputHash, io::Error> { let hash = OutputHash(StringHash(hasher.finalize().into())); fs::rename(filename, paths::output_filename(&hash))?; - mount::umount(paths::join(&[&task_tmp_dir, paths::TASK_TMP_BUILD_SUBDIR]).as_str()) - .to_io_result()?; + mount::umount(paths::join(&[&task_tmp_dir, paths::TASK_TMP_BUILD_SUBDIR]).as_str())?; Ok(hash) } |