From e194218169602b304853bedfd9b95c22ce708784 Mon Sep 17 00:00:00 2001 From: Andy Gayton Date: Sat, 22 Jun 2024 00:48:58 -0400 Subject: [PATCH] wip --- crates/nu-protocol/src/engine/ctrlc.rs | 8 ++++---- src/signals.rs | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/crates/nu-protocol/src/engine/ctrlc.rs b/crates/nu-protocol/src/engine/ctrlc.rs index ef85e707f8..a3f81d060c 100644 --- a/crates/nu-protocol/src/engine/ctrlc.rs +++ b/crates/nu-protocol/src/engine/ctrlc.rs @@ -4,18 +4,18 @@ use std::sync::{ Arc, Mutex, }; -type CtrlcHandler = Box; +type Handler = Box; #[derive(Clone)] pub struct Handlers { - handlers: Arc>>, + handlers: Arc>>, next_id: Arc, } #[derive(Clone)] pub struct Guard { id: usize, - handlers: Arc>>, + handlers: Arc>>, } impl Drop for Guard { @@ -39,7 +39,7 @@ impl Handlers { Handlers { handlers, next_id } } - pub fn add(&self, handler: CtrlcHandler) -> Guard { + pub fn add(&self, handler: Handler) -> Guard { let id = self.next_id.fetch_add(1, Ordering::Relaxed); if let Ok(mut handlers) = self.handlers.lock() { handlers.push((id, handler)); diff --git a/src/signals.rs b/src/signals.rs index e08703895e..e434fec393 100644 --- a/src/signals.rs +++ b/src/signals.rs @@ -5,7 +5,6 @@ use std::sync::{ }; pub(crate) fn ctrlc_protection(engine_state: &mut EngineState) { - let ctrlc = Arc::new(AtomicBool::new(false)); let handlers = Handlers::new();