clippy: Fix new clippy rules

This commit is contained in:
andy.boot
2023-01-26 23:20:29 +00:00
parent 83ef2525aa
commit 810cc8b604
4 changed files with 17 additions and 15 deletions

View File

@@ -86,7 +86,7 @@ fn convert_min_size(input: &str, iso: bool) -> Option<usize> {
Some(marker)
}
Err(_) => {
eprintln!("Ignoring invalid min-size: {}", input);
eprintln!("Ignoring invalid min-size: {input}");
None
}
};
@@ -96,7 +96,7 @@ fn convert_min_size(input: &str, iso: bool) -> Option<usize> {
starts
.parse()
.map_err(|_| {
eprintln!("Ignoring invalid min-size: {}", input);
eprintln!("Ignoring invalid min-size: {input}");
})
.ok()
}

View File

@@ -216,7 +216,7 @@ fn display_node(node: &DisplayNode, draw_data: &DrawData, is_biggest: bool, is_l
let to_print = format_string(node, &indent, &bar_text, is_biggest, draw_data.display_data);
if !draw_data.display_data.is_reversed {
println!("{}", to_print)
println!("{to_print}")
}
let dd = DrawData {
@@ -237,7 +237,7 @@ fn display_node(node: &DisplayNode, draw_data: &DrawData, is_biggest: bool, is_l
}
if draw_data.display_data.is_reversed {
println!("{}", to_print)
println!("{to_print}")
}
}
@@ -278,7 +278,7 @@ fn get_printable_name<P: AsRef<Path>>(dir_name: &P, short_paths: bool) -> String
fn pad_or_trim_filename(node: &DisplayNode, indent: &str, display_data: &DisplayData) -> String {
let name = get_printable_name(&node.name, display_data.short_paths);
let indent_and_name = format!("{} {}", indent, name);
let indent_and_name = format!("{indent} {name}");
let width = UnicodeWidthStr::width(&*indent_and_name);
assert!(
@@ -321,7 +321,7 @@ pub fn format_string(
let (percents, name_and_padding) = get_name_percent(node, indent, percent_bar, display_data);
let pretty_size = get_pretty_size(node, is_biggest, display_data);
let pretty_name = get_pretty_name(node, name_and_padding, display_data);
format!("{} {} {}{}", pretty_size, indent, pretty_name, percents)
format!("{pretty_size} {indent} {pretty_name}{percents}")
}
fn get_name_percent(
@@ -331,8 +331,9 @@ fn get_name_percent(
display_data: &DisplayData,
) -> (String, String) {
if !bar_chart.is_empty() {
let percent_size_str = format!("{:.0}%", display_data.percent_size(node) * 100.0);
let percents = format!("{}{:>4}", bar_chart, percent_size_str);
let percent = display_data.percent_size(node) * 100.0;
let percent_size_str = format!("{percent:.0}%");
let percents = format!("{bar_chart}{percent_size_str:>4}");
let name_and_padding = pad_or_trim_filename(node, indent, display_data);
(percents, name_and_padding)
} else {
@@ -371,7 +372,8 @@ fn get_pretty_name(
let ansi_style = directory_color
.map(Style::to_ansi_term_style)
.unwrap_or_default();
format!("{}", ansi_style.paint(name_and_padding))
let out = ansi_style.paint(name_and_padding);
format!("{out}")
} else {
name_and_padding
}
@@ -389,7 +391,7 @@ pub fn human_readable_number(size: u64, iso: bool) -> String {
}
}
}
format!("{}B", size)
format!("{size}B")
}
mod tests {

View File

@@ -90,7 +90,7 @@ fn get_regex_value(maybe_value: Option<Values>) -> Vec<Regex> {
.unwrap_or_default()
.map(|reg| {
Regex::new(reg).unwrap_or_else(|err| {
eprintln!("Ignoring bad value for regex {:?}", err);
eprintln!("Ignoring bad value for regex {err:?}");
process::exit(1)
})
})

View File

@@ -73,15 +73,15 @@ impl PAtomicInfo {
fn format_preparing_str(prog_char: char, data: &PAtomicInfo, is_iso: bool) -> String {
let path_in = data.current_path.get();
let size = human_readable_number(data.total_file_size.load(ORDERING), is_iso);
format!("Preparing: {} {} ... {}", path_in, size, prog_char)
format!("Preparing: {path_in} {size} ... {prog_char}")
}
fn format_indexing_str(prog_char: char, data: &PAtomicInfo, is_iso: bool) -> String {
let path_in = data.current_path.get();
let file_count = data.num_files.load(ORDERING);
let size = human_readable_number(data.total_file_size.load(ORDERING), is_iso);
let file_str = format!("{} files, {}", file_count, size);
format!("Indexing: {} {} ... {}", path_in, file_str, prog_char)
let file_str = format!("{file_count} files, {size}");
format!("Indexing: {path_in} {file_str} ... {prog_char}")
}
pub struct PIndicator {
@@ -123,7 +123,7 @@ impl PIndicator {
_ => panic!("Unknown State"),
};
write!(stdout, "\r{}", msg).unwrap();
write!(stdout, "\r{msg}").unwrap();
stdout.flush().unwrap();
progress_char_i += 1;