diff options
author | Jesse Luehrs <doy@tozt.net> | 2022-01-04 19:56:06 -0500 |
---|---|---|
committer | Jesse Luehrs <doy@tozt.net> | 2022-01-04 19:56:06 -0500 |
commit | f433004c25d6a0300b4e6330994f77cfc800409e (patch) | |
tree | 44f110b8d387806a658fe32d63e4e0cb0745afae /src/event.rs | |
parent | 9bdaa0fdb23e14cbadb1b4e96ce1217f2976ac80 (diff) | |
download | nbsh-f433004c25d6a0300b4e6330994f77cfc800409e.tar.gz nbsh-f433004c25d6a0300b4e6330994f77cfc800409e.zip |
pipeline events should be separate from internal events
Diffstat (limited to 'src/event.rs')
-rw-r--r-- | src/event.rs | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/src/event.rs b/src/event.rs index 771d69b..0343cdb 100644 --- a/src/event.rs +++ b/src/event.rs @@ -1,34 +1,13 @@ -#[derive(Debug, serde::Serialize, serde::Deserialize)] +#[derive(Debug)] pub enum Event { - #[serde( - serialize_with = "serialize_key", - deserialize_with = "deserialize_key" - )] Key(textmode::Key), Resize((u16, u16)), PtyOutput, PtyClose, ChildSuspend(usize), - PipelineExit(crate::env::Env), ClockTimer, } -#[allow(clippy::trivially_copy_pass_by_ref, clippy::needless_pass_by_value)] -fn serialize_key<S>(_key: &textmode::Key, _s: S) -> Result<S::Ok, S::Error> -where - S: serde::Serializer, -{ - todo!() -} - -#[allow(clippy::trivially_copy_pass_by_ref, clippy::needless_pass_by_value)] -fn deserialize_key<'de, D>(_d: D) -> Result<textmode::Key, D::Error> -where - D: serde::Deserializer<'de>, -{ - todo!() -} - pub struct Reader { pending: async_std::sync::Mutex<Pending>, cvar: async_std::sync::Condvar, @@ -78,7 +57,6 @@ struct Pending { pty_output: bool, pty_close: bool, child_suspend: std::collections::VecDeque<usize>, - pipeline_exit: std::collections::VecDeque<crate::env::Env>, clock_timer: bool, done: bool, } @@ -95,7 +73,6 @@ impl Pending { || self.pty_output || self.pty_close || !self.child_suspend.is_empty() - || !self.pipeline_exit.is_empty() || self.clock_timer } @@ -116,9 +93,6 @@ impl Pending { if let Some(idx) = self.child_suspend.pop_front() { return Some(Event::ChildSuspend(idx)); } - if let Some(env) = self.pipeline_exit.pop_front() { - return Some(Event::PipelineExit(env)); - } if self.clock_timer { self.clock_timer = false; return Some(Event::ClockTimer); @@ -142,9 +116,6 @@ impl Pending { Some(Event::ChildSuspend(idx)) => { self.child_suspend.push_back(idx); } - Some(Event::PipelineExit(env)) => { - self.pipeline_exit.push_back(env); - } Some(Event::ClockTimer) => self.clock_timer = true, None => self.done = true, } |