From 4206db397f8ae4161fcfefef23ffa207f3a5a761 Mon Sep 17 00:00:00 2001 From: Integral Date: Mon, 2 Dec 2024 17:44:27 +0800 Subject: [PATCH] refactor: Replace format! with other macros/methods when unnecessary (#176) --- build.rs | 2 +- src/app.rs | 2 +- src/args.rs | 7 +++++-- src/kernel/lkm.rs | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build.rs b/build.rs index 2cb6dc3..18cda7c 100644 --- a/build.rs +++ b/build.rs @@ -28,7 +28,7 @@ fn build_shell_completions(out_dir: &Path) -> Result<(), IoError> { fn build_manpage(out_dir: &Path) -> Result<(), IoError> { fs::create_dir_all(out_dir)?; let app = args::get_args(); - let file = out_dir.join(format!("{}.8", env!("CARGO_PKG_NAME"))); + let file = out_dir.join(concat!(env!("CARGO_PKG_NAME"), ".8")); let mut file = File::create(file)?; Man::new(app).render(&mut file)?; Ok(()) diff --git a/src/app.rs b/src/app.rs index 71209e4..e4fa5c5 100644 --- a/src/app.rs +++ b/src/app.rs @@ -383,7 +383,7 @@ impl App { for module in &mut kernel_module_list { if module[2].len() > dependent_width { module[2].truncate(dependent_width); - module[2] = format!("{}...", module[2]); + module[2].push_str("..."); } } kernel_modules.list = kernel_module_list; diff --git a/src/args.rs b/src/args.rs index ec58065..befe7e0 100644 --- a/src/args.rs +++ b/src/args.rs @@ -15,12 +15,15 @@ pub fn get_args() -> App { App::new(env!("CARGO_PKG_NAME")) .version(env!("CARGO_PKG_VERSION")) .author(env!("CARGO_PKG_AUTHORS")) - .about(format!( - "{} {}\n{}\n{}\n\n{}", + .about(concat!( env!("CARGO_PKG_NAME"), + " ", env!("CARGO_PKG_VERSION"), + "\n", env!("CARGO_PKG_AUTHORS"), + "\n", env!("CARGO_PKG_DESCRIPTION"), + "\n\n", "Press '?' while running the terminal UI to see key bindings." )) .before_help(ASCII_LOGO) diff --git a/src/kernel/lkm.rs b/src/kernel/lkm.rs index 93c3de4..1c181db 100644 --- a/src/kernel/lkm.rs +++ b/src/kernel/lkm.rs @@ -109,7 +109,8 @@ impl KernelModules<'_> { let columns: Vec<&str> = line.split_whitespace().collect(); let mut module_name = format!(" {}", columns[0]); if columns.len() >= 7 { - module_name = format!("{} {}", module_name, columns[6]); + module_name.push(' '); + module_name.push_str(columns[6]); } let mut used_modules = format!("{} {}", columns[2], columns[3]); if used_modules.ends_with(',') {