Implement fmt::Display for Signal

Author: Thomasdezeeuw

src/process.rs

@@ -626,6 +626,50 @@ impl Signal {
     }
 }
 
+impl fmt::Display for Signal {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.write_str(match *self {
+            Signal::HUP => "hangup",
+            Signal::INTERRUPT => "interrupt",
+            Signal::QUIT => "quit",
+            Signal::ILLEGAL => "illegal",
+            Signal::TRAP => "trap",
+            Signal::ABORT => "abort",
+            #[allow(unreachable_patterns)] // Same as ABORT.
+            Signal::IOT => "iot",
+            Signal::KILL => "kill",
+            Signal::BUS => "bus",
+            Signal::FP_ERROR => "floating-point-error",
+            Signal::USER1 => "user-1",
+            Signal::USER2 => "user-2",
+            Signal::SEG_VAULT => "segfault",
+            Signal::PIPE => "pipe",
+            Signal::ALARM => "alarm",
+            Signal::TERMINATION => "termination",
+            Signal::CHILD => "child",
+            Signal::CONTINUE => "continue",
+            Signal::STOP => "stop",
+            Signal::TERM_STOP => "terminal stop",
+            Signal::TTY_IN => "terminal-input",
+            Signal::TTY_OUT => "terminal-output",
+            Signal::URGENT => "urgent",
+            Signal::EXCEEDED_CPU => "exceeded-cpu",
+            Signal::EXCEEDED_FILE_SIZE => "excess-file-size",
+            Signal::VIRTUAL_ALARM => "virtual-alarm",
+            Signal::PROFILE_ALARM => "profile-alarm",
+            Signal::WINDOW_RESIZE => "window-change",
+            Signal::IO => "I/O",
+            #[cfg(any(target_os = "android", target_os = "linux"))]
+            #[allow(unreachable_patterns)] // Same as IO.
+            Signal::POLL => "poll",
+            #[cfg(any(target_os = "android", target_os = "linux"))]
+            Signal::PWR => "power-failure",
+            Signal::SYS => "bad-syscall",
+            _ => return write!(f, "Signal({})", self.0),
+        })
+    }
+}
+
 /// Who to send a signal to, see [`send_signal`].
 #[derive(Copy, Clone, Debug)]
 pub enum To {

tests/signals.rs

@@ -47,41 +47,6 @@ const SIGNALS: &[Signal] = &[
     Signal::SYS,
 ];
 
-const SIGNAL_NAMES: [&str; SIGNALS.len()] = [
-    "SIGHUP",
-    "SIGINT",
-    "SIGQUIT",
-    "SIGILL",
-    "SIGTRAP",
-    "SIGABRT",
-    "SIGIOT",
-    "SIGBUS",
-    "SIGFPE",
-    "SIGUSR1",
-    "SIGUSR2",
-    "SIGSEGV",
-    "SIGPIPE",
-    "SIGALRM",
-    "SIGTERM",
-    "SIGCHLD",
-    "SIGCONT",
-    "SIGTSTP",
-    "SIGTTIN",
-    "SIGTTOU",
-    "SIGURG",
-    "SIGXCPU",
-    "SIGXFSZ",
-    "SIGVTALRM",
-    "SIGPROF",
-    "SIGWINCH",
-    "SIGIO",
-    #[cfg(any(target_os = "android", target_os = "linux"))]
-    "SIGPOLL",
-    #[cfg(any(target_os = "android", target_os = "linux"))]
-    "SIGPWR",
-    "SIGSYS",
-];
-
 fn main() {
     init();
     let start = Instant::now();
@@ -154,10 +119,10 @@ impl TestHarness {
         F: FnMut(&mut Ring, &Signals, Signal),
     {
         let signals = self.signals.as_ref().unwrap();
-        for (signal, name) in SIGNALS.iter().copied().zip(SIGNAL_NAMES) {
+        for signal in SIGNALS.into_iter().copied() {
             print_test_start(
                 self.quiet,
-                format_args!("{test_name} ({:?}, {name})", self.fd_kind),
+                format_args!("{test_name} ({:?}, {signal}, {signal:?})", self.fd_kind),
             );
             // thread sanitizer can't deal with `SIGSYS` signal being send.
             #[cfg(feature = "nightly")]
@@ -215,10 +180,10 @@ impl TestHarness {
     fn test_receive_signals(&mut self) {
         let pid = std::process::id();
         let mut receive_signal = self.signals.take().unwrap().receive_signals();
-        for (signal, name) in SIGNALS.into_iter().zip(SIGNAL_NAMES) {
+        for signal in SIGNALS.into_iter() {
             print_test_start(
                 self.quiet,
-                format_args!("receive_signals ({:?}, {name})", self.fd_kind),
+                format_args!("receive_signals ({:?}, {signal}, {signal:?})", self.fd_kind),
             );
             // thread sanitizer can't deal with `SIGSYS` signal being send.
             #[cfg(feature = "nightly")]