From e9fc643bd9d01be4c15507c7aa0941e4b112acf6 Mon Sep 17 00:00:00 2001 From: Arijit Basu Date: Mon, 9 Jan 2023 16:46:27 +0530 Subject: [PATCH] Fix test --- src/app.rs | 4 ++-- src/config.rs | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/app.rs b/src/app.rs index 1ee5537..09008db 100644 --- a/src/app.rs +++ b/src/app.rs @@ -1105,7 +1105,7 @@ impl App { .and_then(App::reset_input_buffer) } - fn switch_mode_keeping_input_buffer(mut self, mode: &str) -> Result { + fn switch_mode_keeping_input_buffer(self, mode: &str) -> Result { if self.config.modes.builtin.contains_key(mode) { self.switch_mode_builtin(mode) } else if self.config.modes.custom.contains_key(mode) { @@ -1165,7 +1165,7 @@ impl App { } } - fn switch_layout(mut self, layout: &str) -> Result { + fn switch_layout(self, layout: &str) -> Result { if self.config.layouts.builtin.contains_key(layout) { self.switch_layout_builtin(layout) } else if self.config.layouts.custom.contains_key(layout) { diff --git a/src/config.rs b/src/config.rs index 7b37c0b..5749e2b 100644 --- a/src/config.rs +++ b/src/config.rs @@ -537,6 +537,12 @@ pub struct ModesConfig { pub custom: HashMap, } +impl ModesConfig { + pub fn get(&self, name: &str) -> Option<&Mode> { + self.builtin.get(name).or_else(|| self.custom.get(name)) + } +} + #[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq, Eq)] #[serde(deny_unknown_fields)] pub struct PanelUiConfig {