util: improve formatting of exit status errors

1 files changed, 10 insertions, 8 deletions

diff --git a/src/util/mod.rs b/src/util/mod.rs
index 5603178..937f402 100644
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -22,7 +22,7 @@ impl Checkable for ExitStatus {
 		} else {
 			Err(Error::new(
 				ErrorKind::Other,
-				format!("process exited with status {}", self),
+				format!("Process exited with {}", self),
 			))
 		}
 	}
@@ -30,12 +30,14 @@ impl Checkable for ExitStatus {
 
 impl Checkable for wait::WaitStatus {
 	fn check(&self) -> Result<()> {
-		match self {
-			wait::WaitStatus::Exited(_, 0) => Ok(()),
-			_ => Err(Error::new(
-				ErrorKind::Other,
-				format!("process exited with status {:?}", self),
-			)),
-		}
+		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))
 	}
 }