Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-15 22:44:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename Sigchecker to SigChecker to be more idiomatic

Browse source 
Idiomatic rust naming for types is "PascalCase" and this was more "Pascalcase".
This commit is contained in:
Mahmoud Al-Qudsi 2023-05-02 11:29:18 -05:00
parent 55c3df7f41
commit 6a3ece6766
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fish-rust/src/builtins/wait.rs
View file

@ -5,7 +5,7 @@ use crate::builtins::shared::{
STATUS_CMD_OK, STATUS_INVALID_ARGS, STATUS_CMD_OK, STATUS_INVALID_ARGS,
}; };
use crate::ffi::{job_t, parser_t, proc_wait_any, Repin}; use crate::ffi::{job_t, parser_t, proc_wait_any, Repin};
use crate::signal::Sigchecker; use crate::signal::SigChecker;
use crate::wait_handle::{WaitHandleRef, WaitHandleStore}; use crate::wait_handle::{WaitHandleRef, WaitHandleStore};
use crate::wchar::{widestrs, wstr}; use crate::wchar::{widestrs, wstr};
use crate::wgetopt::{wgetopter_t, wopt, woption, woption_argument_t}; use crate::wgetopt::{wgetopter_t, wopt, woption, woption_argument_t};
@ -112,7 +112,7 @@ fn wait_for_completion(
return Some(0); return Some(0);
} }
let mut sigint = Sigchecker::new_sighupint(); let mut sigint = SigChecker::new_sighupint();
loop { loop {
let finished = if any_flag { let finished = if any_flag {
whs.iter().any(is_completed) whs.iter().any(is_completed)

6
fish-rust/src/io.rs
View file

@ -10,7 +10,7 @@ use crate::global_safety::RelaxedAtomicBool;
use crate::job_group::JobGroup; use crate::job_group::JobGroup;
use crate::path::path_apply_working_directory; use crate::path::path_apply_working_directory;
use crate::redirection::{RedirectionMode, RedirectionSpecList}; use crate::redirection::{RedirectionMode, RedirectionSpecList};
use crate::signal::Sigchecker; use crate::signal::SigChecker;
use crate::topic_monitor::topic_t; use crate::topic_monitor::topic_t;
use crate::wchar::{wstr, WString, L}; use crate::wchar::{wstr, WString, L};
use crate::wutil::{perror, wdirname, wstat, wwrite_to_fd}; use crate::wutil::{perror, wdirname, wstat, wwrite_to_fd};
@ -789,7 +789,7 @@ pub struct FdOutputStream {
fd: RawFd, fd: RawFd,
/// Used to check if a SIGINT has been received when EINTR is encountered /// Used to check if a SIGINT has been received when EINTR is encountered
sigcheck: Sigchecker, sigcheck: SigChecker,
/// Whether we have received an error. /// Whether we have received an error.
errored: bool, errored: bool,
@ -800,7 +800,7 @@ impl FdOutputStream {
assert!(fd >= 0, "Invalid fd"); assert!(fd >= 0, "Invalid fd");
FdOutputStream { FdOutputStream {
fd, fd,
sigcheck: Sigchecker::new(topic_t::sighupint), sigcheck: SigChecker::new(topic_t::sighupint),
errored: false, errored: false,
} }
} }

6
fish-rust/src/signal.rs
View file

@ -359,15 +359,15 @@ pub fn signal_unblock_all() {
} }
/// A Sigchecker can be used to check if a SIGINT (or SIGHUP) has been delivered. /// A Sigchecker can be used to check if a SIGINT (or SIGHUP) has been delivered.
pub struct Sigchecker { pub struct SigChecker {
topic: topic_t, topic: topic_t,
gen: generation_t, gen: generation_t,
} }
impl Sigchecker { impl SigChecker {
/// Create a new checker for the given topic. /// Create a new checker for the given topic.
pub fn new(topic: topic_t) -> Self { pub fn new(topic: topic_t) -> Self {
let mut res = Sigchecker { topic, gen: 0 }; let mut res = SigChecker { topic, gen: 0 };
// Call check() to update our generation. // Call check() to update our generation.
res.check(); res.check();
res res