From 82c5f505f123a3a1cc92545d39f7bd1dc8e7bea1 Mon Sep 17 00:00:00 2001 From: Yutaka Kamei Date: Wed, 28 Apr 2021 13:40:04 +0900 Subject: [PATCH] refactor(handler): refer to self.config.keybinds internally Because `handle_key` can refer to `self.config.keybinds` by itself, it doesn't have to receive the third argument. Also, this change may slightly improve the performance as it deletes `clone()`. --- src/common/input/handler.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/input/handler.rs b/src/common/input/handler.rs index 66fb6271..197f8315 100644 --- a/src/common/input/handler.rs +++ b/src/common/input/handler.rs @@ -58,7 +58,6 @@ impl InputHandler { fn handle_input(&mut self) { let mut err_ctx = OPENCALLS.with(|ctx| *ctx.borrow()); err_ctx.add_call(ContextType::StdinHandler); - let keybinds = self.config.keybinds.clone(); let alt_left_bracket = vec![27, 91]; loop { if self.should_exit { @@ -70,14 +69,14 @@ impl InputHandler { Ok((event, raw_bytes)) => match event { termion::event::Event::Key(key) => { let key = cast_termion_key(key); - self.handle_key(&key, raw_bytes, &keybinds); + self.handle_key(&key, raw_bytes); } termion::event::Event::Unsupported(unsupported_key) => { // we have to do this because of a bug in termion // this should be a key event and not an unsupported event if unsupported_key == alt_left_bracket { let key = Key::Alt('['); - self.handle_key(&key, raw_bytes, &keybinds); + self.handle_key(&key, raw_bytes); } } termion::event::Event::Mouse(_) => { @@ -90,8 +89,9 @@ impl InputHandler { } } } - fn handle_key(&mut self, key: &Key, raw_bytes: Vec, keybinds: &Keybinds) { - for action in Keybinds::key_to_actions(&key, raw_bytes, &self.mode, &keybinds) { + fn handle_key(&mut self, key: &Key, raw_bytes: Vec) { + let keybinds = &self.config.keybinds; + for action in Keybinds::key_to_actions(&key, raw_bytes, &self.mode, keybinds) { let should_exit = self.dispatch_action(action); if should_exit { self.should_exit = true;