Mirrors/bottom
2
0
Fork 0
mirror of https://github.com/ClementTsang/bottom synced 2024-11-21 19:53:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactor: run clippy after updating to Rust 1.80 (#1502)

Browse source
This commit is contained in:
Clement Tsang 2024-07-26 00:44:38 +00:00 committed by GitHub
parent 29029b86fb
commit a794cc5123
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/app/query.rs
View file

@ -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)?),
));
}
}

6
src/canvas/widgets/process_table.rs
View file

@ -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,
) {