refactor: separate error code

Signed-off-by: Aminu 'Seun Joshua <[email protected]>

Author: seun-ja

src/subprocess.rs

@@ -1,32 +1,44 @@
-use std::os::unix::process::ExitStatusExt as _;
-
 /// An error representing a subprocess that errored
 ///
 /// This can be used to propogate a subprocesses exit status.
 /// When this error is encountered the cli will exit with the status code
 /// instead of printing an error,
 #[derive(Debug)]
-pub struct ExitStatusError {
-    status: Option<i32>,
+pub enum ExitStatusError {
+    ExitCode(i32),
+    Signal(i32),
+    Unknown,
 }
 
 impl ExitStatusError {
-    #[cfg(windows)]
+    #[cfg(unix)]
     pub(crate) fn new(status: std::process::ExitStatus) -> Self {
-        Self {
-            status: status.code(),
+        use std::os::unix::process::ExitStatusExt as _;
+
+        if let Some(code) = status.code() {
+            Self::ExitCode(code)
+        } else if let Some(signal) = status.signal() {
+            Self::Signal(signal)
+        } else {
+            Self::Unknown
         }
     }
 
-    #[cfg(unix)]
+    #[cfg(windows)]
     pub(crate) fn new(status: std::process::ExitStatus) -> Self {
-        Self {
-            status: status.code().or_else(|| status.signal()),
+        if let Some(code) = status.code() {
+            Self::ExitCode(code)
+        } else {
+            Self::Unknown
         }
     }
 
     pub fn code(&self) -> i32 {
-        self.status.unwrap_or(1)
+        match self {
+            Self::ExitCode(code) => *code,
+            Self::Signal(signal) => *signal,
+            Self::Unknown => 1,
+        }
     }
 }
 
@@ -35,10 +47,11 @@ impl std::error::Error for ExitStatusError {}
 impl std::fmt::Display for ExitStatusError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let _ = write!(f, "subprocess exited with status: ");
-        if let Some(status) = self.status {
-            writeln!(f, "{status}")
-        } else {
-            writeln!(f, "unknown")
+
+        match self {
+            Self::ExitCode(code) => writeln!(f, "{code}"),
+            Self::Signal(signal) => writeln!(f, "{signal}"),
+            Self::Unknown => writeln!(f, "unknown"),
         }
     }
 }