aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlaž Hrastnik2021-10-26 09:02:36 +0000
committerSkyler Hawthorne2022-06-19 03:54:03 +0000
commitadb6cd537628308a23fe6ea86f1c7b419c4d8c68 (patch)
treee3b56600ff623f6fe482a8bdda841b9ceb593a97
parent0623a72599f5ffe7adfd0ebe5445ad5eaa26ff91 (diff)
Simplify handle_terminal_events signature
-rw-r--r--helix-term/src/application.rs11
1 files changed, 5 insertions, 6 deletions
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index e8fbb7cc..075b9c35 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -213,7 +213,7 @@ impl Application {
tokio::select! {
biased;
- event = reader.next() => {
+ Some(event) = reader.next() => {
self.handle_terminal_events(event)
}
Some(signal) = self.signals.next() => {
@@ -351,7 +351,7 @@ impl Application {
}
}
- pub fn handle_terminal_events(&mut self, event: Option<Result<Event, crossterm::ErrorKind>>) {
+ pub fn handle_terminal_events(&mut self, event: Result<Event, crossterm::ErrorKind>) {
let mut cx = crate::compositor::Context {
editor: &mut self.editor,
jobs: &mut self.jobs,
@@ -359,15 +359,14 @@ impl Application {
};
// Handle key events
let should_redraw = match event {
- Some(Ok(Event::Resize(width, height))) => {
+ Ok(Event::Resize(width, height)) => {
self.compositor.resize(width, height);
self.compositor
.handle_event(Event::Resize(width, height), &mut cx)
}
- Some(Ok(event)) => self.compositor.handle_event(event, &mut cx),
- Some(Err(x)) => panic!("{}", x),
- None => panic!(),
+ Ok(event) => self.compositor.handle_event(event, &mut cx),
+ Err(x) => panic!("{}", x),
};
if should_redraw && !self.editor.should_close() {