From 603a2d6973323cecc9fed02691996d3466a480b3 Mon Sep 17 00:00:00 2001
From: ridiculousfish <rf@fishshell.com>
Date: Sun, 30 Apr 2023 11:30:37 -0700
Subject: [PATCH] Rename sigchecker_t to Sigchecker

This matches Rust naming conventions
---
 fish-rust/src/builtins/wait.rs |  4 ++--
 fish-rust/src/io.rs            |  6 +++---
 fish-rust/src/signal.rs        | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/fish-rust/src/builtins/wait.rs b/fish-rust/src/builtins/wait.rs
index f0bdc43a7..d90cd9357 100644
--- a/fish-rust/src/builtins/wait.rs
+++ b/fish-rust/src/builtins/wait.rs
@@ -5,7 +5,7 @@
     STATUS_CMD_OK, STATUS_INVALID_ARGS,
 };
 use crate::ffi::{job_t, parser_t, proc_wait_any, Repin};
-use crate::signal::sigchecker_t;
+use crate::signal::Sigchecker;
 use crate::wait_handle::{WaitHandleRef, WaitHandleStore};
 use crate::wchar::{widestrs, wstr};
 use crate::wgetopt::{wgetopter_t, wopt, woption, woption_argument_t};
@@ -112,7 +112,7 @@ fn wait_for_completion(
         return Some(0);
     }
 
-    let mut sigint = sigchecker_t::new_sighupint();
+    let mut sigint = Sigchecker::new_sighupint();
     loop {
         let finished = if any_flag {
             whs.iter().any(is_completed)
diff --git a/fish-rust/src/io.rs b/fish-rust/src/io.rs
index 50b0d5524..844dd0684 100644
--- a/fish-rust/src/io.rs
+++ b/fish-rust/src/io.rs
@@ -10,7 +10,7 @@
 use crate::job_group::JobGroup;
 use crate::path::path_apply_working_directory;
 use crate::redirection::{RedirectionMode, RedirectionSpecList};
-use crate::signal::sigchecker_t;
+use crate::signal::Sigchecker;
 use crate::topic_monitor::topic_t;
 use crate::wchar::{wstr, WString, L};
 use crate::wutil::{perror, wdirname, wstat, wwrite_to_fd};
@@ -789,7 +789,7 @@ pub struct FdOutputStream {
     fd: RawFd,
 
     /// Used to check if a SIGINT has been received when EINTR is encountered
-    sigcheck: sigchecker_t,
+    sigcheck: Sigchecker,
 
     /// Whether we have received an error.
     errored: bool,
@@ -800,7 +800,7 @@ pub fn new(fd: RawFd) -> Self {
         assert!(fd >= 0, "Invalid fd");
         FdOutputStream {
             fd,
-            sigcheck: sigchecker_t::new(topic_t::sighupint),
+            sigcheck: Sigchecker::new(topic_t::sighupint),
             errored: false,
         }
     }
diff --git a/fish-rust/src/signal.rs b/fish-rust/src/signal.rs
index fd8607336..61f94e1d7 100644
--- a/fish-rust/src/signal.rs
+++ b/fish-rust/src/signal.rs
@@ -8,23 +8,23 @@
 use widestring::U32CStr;
 use widestring_suffix::widestrs;
 
-/// A sigint_detector_t can be used to check if a SIGINT (or SIGHUP) has been delivered.
-pub struct sigchecker_t {
+/// A Sigchecker can be used to check if a SIGINT (or SIGHUP) has been delivered.
+pub struct Sigchecker {
     topic: topic_t,
     gen: generation_t,
 }
 
-impl sigchecker_t {
+impl Sigchecker {
     /// Create a new checker for the given topic.
-    pub fn new(topic: topic_t) -> sigchecker_t {
-        let mut res = sigchecker_t { topic, gen: 0 };
+    pub fn new(topic: topic_t) -> Self {
+        let mut res = Sigchecker { topic, gen: 0 };
         // Call check() to update our generation.
         res.check();
         res
     }
 
     /// Create a new checker for SIGHUP and SIGINT.
-    pub fn new_sighupint() -> sigchecker_t {
+    pub fn new_sighupint() -> Self {
         Self::new(topic_t::sighupint)
     }