Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-25 04:13:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactor: use format_args!() when String creation is unnecessary

Browse source
This commit is contained in:
Integral 2024-12-24 11:02:45 +08:00
parent f3dd4ee022
commit 6f5923bda3
No known key found for this signature in database
GPG key ID: 06313911057DD5A8
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/timer.rs
View file

@ -108,10 +108,12 @@ impl TimerSnapshot {
let mut output = String::new(); let mut output = String::new();
if !verbose { if !verbose {
output += "\n_______________________________"; output += &format!(
output += &format!("\nExecuted in {:6.2} {}", wall_time, wall_unit.long_name()); "\n_______________________________\n{}\n {}\n {}",
output += &format!("\n usr time {:6.2} {}", usr_time, cpu_unit.long_name()); format_args!("Executed in {:6.2} {}", wall_time, wall_unit.long_name()),
output += &format!("\n sys time {:6.2} {}", sys_time, cpu_unit.long_name()); format_args!("usr time {:6.2} {}", usr_time, cpu_unit.long_name()),
format_args!("sys time {:6.2} {}", sys_time, cpu_unit.long_name()),
);
} else { } else {
let fish_unit = Unit::for_micros(fish_sys.max(fish_usr).as_micros() as i64); let fish_unit = Unit::for_micros(fish_sys.max(fish_usr).as_micros() as i64);
let child_unit = Unit::for_micros(child_sys.max(child_usr).as_micros() as i64); let child_unit = Unit::for_micros(child_sys.max(child_usr).as_micros() as i64);
@ -129,15 +131,17 @@ impl TimerSnapshot {
let fish_unit = fish_unit.short_name(); let fish_unit = fish_unit.short_name();
let child_unit = child_unit.short_name(); let child_unit = child_unit.short_name();
output += "\n________________________________________________________";
output += &format!( output += &format!(
"\nExecuted in {wall_time:6.2} {wall_unit:<width1$} {fish:<width2$} external", "\n________________________________________________________\n{}\n {}\n {}",
width1 = column2_unit_len, format_args!(
fish = "fish", "Executed in {wall_time:6.2} {wall_unit:<width1$} {fish:<width2$} external",
width2 = fish_unit.len() + 7 width1 = column2_unit_len,
fish = "fish",
width2 = fish_unit.len() + 7
),
format_args!("usr time {usr_time:6.2} {cpu_unit:<column2_unit_len$} {fish_usr_time:6.2} {fish_unit} {child_usr_time:6.2} {child_unit}"),
format_args!("sys time {sys_time:6.2} {cpu_unit:<column2_unit_len$} {fish_sys_time:6.2} {fish_unit} {child_sys_time:6.2} {child_unit}")
); );
output += &format!("\n usr time {usr_time:6.2} {cpu_unit:<column2_unit_len$} {fish_usr_time:6.2} {fish_unit} {child_usr_time:6.2} {child_unit}");
output += &format!("\n sys time {sys_time:6.2} {cpu_unit:<column2_unit_len$} {fish_sys_time:6.2} {fish_unit} {child_sys_time:6.2} {child_unit}");
} }
output += "\n"; output += "\n";