From ddb92b57fb92a43dcd3ac03ba987636bbc5d1843 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 26 Oct 2021 23:57:33 +0200
Subject: runner: move Checkable trait into separabe module

---
 crates/runner/src/lib.rs            |  7 ++-----
 crates/runner/src/tar.rs            |  2 +-
 crates/runner/src/task.rs           |  2 +-
 crates/runner/src/util/checkable.rs | 37 +++++++++++++++++++++++++++++++++++
 crates/runner/src/util/mod.rs       | 39 +------------------------------------
 5 files changed, 42 insertions(+), 45 deletions(-)
 create mode 100644 crates/runner/src/util/checkable.rs

diff --git a/crates/runner/src/lib.rs b/crates/runner/src/lib.rs
index 81e328e..d0cc531 100644
--- a/crates/runner/src/lib.rs
+++ b/crates/runner/src/lib.rs
@@ -25,12 +25,9 @@ use nix::{
 use uds::UnixSeqpacketConn;
 
 use common::{error::*, types::*};
-use util::Checkable;
 
-use self::{
-	jobserver::Jobserver,
-	util::{clone, unix},
-};
+use jobserver::Jobserver;
+use util::{checkable::Checkable, clone, unix};
 
 #[derive(Debug, Clone)]
 pub struct Options {
diff --git a/crates/runner/src/tar.rs b/crates/runner/src/tar.rs
index 9306775..1fc4bbb 100644
--- a/crates/runner/src/tar.rs
+++ b/crates/runner/src/tar.rs
@@ -16,7 +16,7 @@ use common::error::*;
 
 use super::{
 	ns,
-	util::{fs, Checkable},
+	util::{checkable::Checkable, fs},
 };
 use crate::paths;
 
diff --git a/crates/runner/src/task.rs b/crates/runner/src/task.rs
index e27fd49..2b0070b 100644
--- a/crates/runner/src/task.rs
+++ b/crates/runner/src/task.rs
@@ -22,7 +22,7 @@ use common::{error::*, string_hash::*, types::*};
 use super::{
 	jobserver::Jobserver,
 	ns, tar,
-	util::{cjson, fs, Checkable},
+	util::{checkable::Checkable, cjson, fs},
 };
 use crate::{paths, util::unix};
 
diff --git a/crates/runner/src/util/checkable.rs b/crates/runner/src/util/checkable.rs
new file mode 100644
index 0000000..8528d29
--- /dev/null
+++ b/crates/runner/src/util/checkable.rs
@@ -0,0 +1,37 @@
+use std::{
+	io::{Error, ErrorKind, Result},
+	process::ExitStatus,
+};
+
+use nix::sys::wait;
+
+pub trait Checkable {
+	fn check(&self) -> Result<()>;
+}
+
+impl Checkable for ExitStatus {
+	fn check(&self) -> Result<()> {
+		if self.success() {
+			Ok(())
+		} else {
+			Err(Error::new(
+				ErrorKind::Other,
+				format!("Process exited with {}", self),
+			))
+		}
+	}
+}
+
+impl Checkable for wait::WaitStatus {
+	fn check(&self) -> Result<()> {
+		let message = match self {
+			wait::WaitStatus::Exited(_, 0) => return Ok(()),
+			wait::WaitStatus::Exited(_, code) => format!("Process exited with exit code: {}", code),
+			wait::WaitStatus::Signaled(_, signal, _) => {
+				format!("Process exited with signal: {}", signal)
+			}
+			_ => format!("Process in unexpected status: {:?}", self),
+		};
+		Err(Error::new(ErrorKind::Other, message))
+	}
+}
diff --git a/crates/runner/src/util/mod.rs b/crates/runner/src/util/mod.rs
index eff589d..5310ccf 100644
--- a/crates/runner/src/util/mod.rs
+++ b/crates/runner/src/util/mod.rs
@@ -1,42 +1,5 @@
+pub mod checkable;
 pub mod cjson;
 pub mod clone;
 pub mod fs;
 pub mod unix;
-
-use std::{
-	io::{Error, ErrorKind, Result},
-	process::ExitStatus,
-};
-
-use nix::sys::wait;
-
-pub trait Checkable {
-	fn check(&self) -> Result<()>;
-}
-
-impl Checkable for ExitStatus {
-	fn check(&self) -> Result<()> {
-		if self.success() {
-			Ok(())
-		} else {
-			Err(Error::new(
-				ErrorKind::Other,
-				format!("Process exited with {}", self),
-			))
-		}
-	}
-}
-
-impl Checkable for wait::WaitStatus {
-	fn check(&self) -> Result<()> {
-		let message = match self {
-			wait::WaitStatus::Exited(_, 0) => return Ok(()),
-			wait::WaitStatus::Exited(_, code) => format!("Process exited with exit code: {}", code),
-			wait::WaitStatus::Signaled(_, signal, _) => {
-				format!("Process exited with signal: {}", signal)
-			}
-			_ => format!("Process in unexpected status: {:?}", self),
-		};
-		Err(Error::new(ErrorKind::Other, message))
-	}
-}
-- 
cgit v1.2.3