diff --git a/src/app/query.rs b/src/app/query.rs index 475e89c5..fcb5f95d 100644 --- a/src/app/query.rs +++ b/src/app/query.rs @@ -746,33 +746,31 @@ impl Prefix { is_ignoring_case, is_searching_with_regex, ); - } else if let Some((prefix_type, StringQuery::Value(regex_string))) = &mut self.regex_prefix + } else if let Some(( + PrefixType::Pid | PrefixType::Name | PrefixType::State | PrefixType::User, + StringQuery::Value(regex_string), + )) = &mut self.regex_prefix { - match prefix_type { - PrefixType::Pid | PrefixType::Name | PrefixType::State | PrefixType::User => { - let escaped_regex: String; - let final_regex_string = &format!( - "{}{}{}{}", - if is_searching_whole_word { "^" } else { "" }, - if is_ignoring_case { "(?i)" } else { "" }, - if !is_searching_with_regex { - escaped_regex = regex::escape(regex_string); - &escaped_regex - } else { - regex_string - }, - if is_searching_whole_word { "$" } else { "" }, - ); + let escaped_regex: String; + let final_regex_string = &format!( + "{}{}{}{}", + if is_searching_whole_word { "^" } else { "" }, + if is_ignoring_case { "(?i)" } else { "" }, + if !is_searching_with_regex { + escaped_regex = regex::escape(regex_string); + &escaped_regex + } else { + regex_string + }, + if is_searching_whole_word { "$" } else { "" }, + ); - let taken_pwc = self.regex_prefix.take(); - if let Some((taken_pt, _)) = taken_pwc { - self.regex_prefix = Some(( - taken_pt, - StringQuery::Regex(Regex::new(final_regex_string)?), - )); - } - } - _ => {} + let taken_pwc = self.regex_prefix.take(); + if let Some((taken_pt, _)) = taken_pwc { + self.regex_prefix = Some(( + taken_pt, + StringQuery::Regex(Regex::new(final_regex_string)?), + )); } } diff --git a/src/canvas/widgets/process_table.rs b/src/canvas/widgets/process_table.rs index 11fe1b1e..3b2d046e 100644 --- a/src/canvas/widgets/process_table.rs +++ b/src/canvas/widgets/process_table.rs @@ -108,8 +108,7 @@ impl Painter { /// Draws the process search field. /// - `widget_id` represents the widget ID of the search box itself --- NOT - /// the process widget - /// state that is stored. + /// the process widget state that is stored. fn draw_search_field( &self, f: &mut Frame<'_>, app_state: &mut App, draw_loc: Rect, draw_border: bool, widget_id: u64, @@ -313,8 +312,7 @@ impl Painter { /// Draws the process sort box. /// - `widget_id` represents the widget ID of the sort box itself --- NOT - /// the process widget - /// state that is stored. + /// the process widget state that is stored. fn draw_sort_table( &self, f: &mut Frame<'_>, app_state: &mut App, draw_loc: Rect, widget_id: u64, ) {