From 409bf2995d5533cb456d05740ace2a5e44bfb440 Mon Sep 17 00:00:00 2001
From: ridiculousfish <rf@fishshell.com>
Date: Sun, 12 Mar 2023 17:08:24 -0700
Subject: [PATCH] Switch signals from usize to i32

This eliminates some conversions.
---
 fish-rust/src/event.rs  | 29 +++++++++++++++--------------
 fish-rust/src/signal.rs |  8 ++++----
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/fish-rust/src/event.rs b/fish-rust/src/event.rs
index 31aee6f5a..20972056e 100644
--- a/fish-rust/src/event.rs
+++ b/fish-rust/src/event.rs
@@ -108,7 +108,7 @@ pub enum EventType {
     /// well).
     Any,
     /// An event triggered by a signal.
-    Signal { signal: usize },
+    Signal { signal: i32 },
     /// An event triggered by a variable update.
     Variable { name: WString },
     /// An event triggered by a process exit.
@@ -552,15 +552,19 @@ pub fn acquire_pending(&self) -> u64 {
 /// temporarily moved here. There was no mutex around this in the cpp code. TODO: Move it back.
 static BLOCKED_EVENTS: Mutex<Vec<Event>> = Mutex::new(Vec::new());
 
-fn inc_signal_observed(sig: usize) {
-    if let Some(sig) = OBSERVED_SIGNALS.get(sig) {
-        sig.fetch_add(1, Ordering::Relaxed);
+fn inc_signal_observed(sig: i32) {
+    if let Ok(index) = usize::try_from(sig) {
+        if let Some(sig) = OBSERVED_SIGNALS.get(index) {
+            sig.fetch_add(1, Ordering::Relaxed);
+        }
     }
 }
 
-fn dec_signal_observed(sig: usize) {
-    if let Some(sig) = OBSERVED_SIGNALS.get(sig) {
-        sig.fetch_sub(1, Ordering::Relaxed);
+fn dec_signal_observed(sig: i32) {
+    if let Ok(index) = usize::try_from(sig) {
+        if let Some(sig) = OBSERVED_SIGNALS.get(index) {
+            sig.fetch_sub(1, Ordering::Relaxed);
+        }
     }
 }
 
@@ -608,11 +612,7 @@ fn event_get_desc_ffi(parser: &parser_t, evt: &Event) -> UniquePtr<CxxWString> {
 /// Add an event handler.
 pub fn add_handler(eh: EventHandler) {
     if let EventType::Signal { signal } = eh.desc.typ {
-        signal_handle(
-            i32::try_from(signal)
-                .expect("signal should be < 2^31")
-                .into(),
-        );
+        signal_handle(ffi::c_int(signal));
         inc_signal_observed(signal);
     }
 
@@ -774,12 +774,13 @@ pub fn fire_delayed(parser: &mut parser_t) {
     // 'signals' contains a bit set for each signal that has been received.
     let mut signals: u64 = PENDING_SIGNALS.acquire_pending();
     while signals != 0 {
-        let sig = signals.trailing_zeros() as usize;
+        let sig = signals.trailing_zeros();
         signals &= !(1_u64 << sig);
+        let sig = sig as i32;
 
         // HACK: The only variables we change in response to a *signal* are $COLUMNS and $LINES.
         // Do that now.
-        if sig == libc::SIGWINCH as usize {
+        if sig == libc::SIGWINCH {
             termsize_container_t::ffi_updating(parser.pin()).within_unique_ptr();
         }
         let event = Event {
diff --git a/fish-rust/src/signal.rs b/fish-rust/src/signal.rs
index e4ce7440e..89bb68ade 100644
--- a/fish-rust/src/signal.rs
+++ b/fish-rust/src/signal.rs
@@ -51,16 +51,16 @@ pub fn wcs2sig(s: &wstr) -> Option<usize> {
 }
 
 /// Get string representation of a signal.
-pub fn sig2wcs(sig: usize) -> &'static wstr {
-    let s = ffi::sig2wcs(i32::try_from(sig).expect("signal should be < 2^31").into());
+pub fn sig2wcs(sig: i32) -> &'static wstr {
+    let s = ffi::sig2wcs(ffi::c_int(sig));
     let s = unsafe { U32CStr::from_ptr_str(s) };
 
     wstr::from_ucstr(s).expect("signal name should be valid utf-32")
 }
 
 /// Returns a description of the specified signal.
-pub fn signal_get_desc(sig: usize) -> &'static wstr {
-    let s = ffi::signal_get_desc(i32::try_from(sig).expect("signal should be < 2^31").into());
+pub fn signal_get_desc(sig: i32) -> &'static wstr {
+    let s = ffi::signal_get_desc(ffi::c_int(sig));
     let s = unsafe { U32CStr::from_ptr_str(s) };
 
     wstr::from_ucstr(s).expect("signal description should be valid utf-32")