chore: clippy & fmt (#378)

sigoden · web-flow · commit d17907fda1be · 2025-07-02T17:29:50.000+08:00
diff --git a/src/argc_value.rs b/src/argc_value.rs
@@ -77,7 +77,7 @@ impl ArgcValue {
                 }
                 ArgcValue::PositionalSingleFn(id, fn_name) => {
                     list.push(format!("{}=`{}`", argc_var_name(id), &fn_name));
-                    positional_args.push(format!("`{}`", fn_name));
+                    positional_args.push(format!("`{fn_name}`"));
                 }
                 ArgcValue::PositionalMultiple(id, values) => {
                     let values = values
@@ -98,7 +98,7 @@ impl ArgcValue {
                     list.push(format!("export {}={}", name, escape_shell_words(value)));
                 }
                 ArgcValue::EnvFn(id, fn_name) => {
-                    list.push(format!("export {}=`{}`", id, fn_name,));
+                    list.push(format!("export {id}=`{fn_name}`",));
                 }
                 ArgcValue::Hook((before, after)) => {
                     if *before {
@@ -122,7 +122,7 @@ impl ArgcValue {
                     } else {
                         last = format!("{} {}", name, positional_args.join(" "));
                     }
-                    list.push(format!("{}_fn={}", VARIABLE_PREFIX, name));
+                    list.push(format!("{VARIABLE_PREFIX}_fn={name}"));
                 }
                 ArgcValue::ParamFn(name) => {
                     if positional_args.is_empty() {
@@ -133,7 +133,7 @@ impl ArgcValue {
                     exit = true;
                 }
                 ArgcValue::Error((error, exit)) => {
-                    return format!("command cat >&2 <<-'EOF' \n{}\nEOF\nexit {}", error, exit)
+                    return format!("command cat >&2 <<-'EOF' \n{error}\nEOF\nexit {exit}")
                 }
             }
         }
diff --git a/src/bin/argc/main.rs b/src/bin/argc/main.rs
@@ -52,7 +52,7 @@ fn run() -> Result<i32> {
         match argc_cmd {
             "--argc-eval" => match run_eval(runtime, args) {
                 Ok(output) => {
-                    println!("{}", output);
+                    println!("{output}");
                 }
                 Err(err) => {
                     println!(
@@ -122,7 +122,7 @@ fn run() -> Result<i32> {
                         })?;
                     }
                 } else {
-                    print!("{}", script);
+                    print!("{script}");
                 }
             }
             "--argc-mangen" => {
@@ -144,7 +144,7 @@ fn run() -> Result<i32> {
                 };
                 let commands = [vec!["argc".to_string()], args[3..].to_vec()].concat();
                 let script = argc::generate_completions(shell, &commands);
-                print!("{}", script);
+                print!("{script}");
             }
             "--argc-compgen" => {
                 run_compgen(runtime, args.to_vec());
@@ -172,7 +172,7 @@ fn run() -> Result<i32> {
             }
             "--argc-shell-path" => {
                 let shell = runtime.shell_path()?;
-                println!("{}", shell);
+                println!("{shell}");
             }
             "--argc-help" => {
                 println!("{}", get_argc_help(runtime)?)
@@ -433,7 +433,7 @@ fn parse_script_args(args: &[String]) -> Result<(String, String, Vec<String>)> {
     let script_file = normalize_script_path(script_file);
     let args: Vec<String> = args[1..].to_vec();
     let source = fs::read_to_string(&script_file)
-        .with_context(|| format!("Failed to load script at '{}'", script_file))?;
+        .with_context(|| format!("Failed to load script at '{script_file}'"))?;
     let name = get_script_name(&script_file)?;
     let name = name.strip_suffix(".sh").unwrap_or(name);
     let mut cmd_args = vec![name.to_string()];
diff --git a/src/command/names_checker.rs b/src/command/names_checker.rs
@@ -24,7 +24,7 @@ impl NamesChecker {
                 bail!("{}", Self::conflict_error(tag_name, pos, name, *exist_pos));
             }
             self.flag_options
-                .insert(name.to_string(), (pos, format!("{} {}", tag_name, name)));
+                .insert(name.to_string(), (pos, format!("{tag_name} {name}")));
         }
         Ok(())
     }
@@ -63,9 +63,6 @@ impl NamesChecker {
         name_desc: &str,
         exist_pos: Position,
     ) -> String {
-        format!(
-            "{}(line {}) has '{}' already exists at line {}",
-            tag_name, pos, name_desc, exist_pos,
-        )
+        format!("{tag_name}(line {pos}) has '{name_desc}' already exists at line {exist_pos}",)
     }
 }
diff --git a/src/compgen.rs b/src/compgen.rs
@@ -227,7 +227,7 @@ pub fn compgen<T: Runtime>(
 
     let break_chars = shell.need_break_chars(runtime, &argc_prefix);
     if !break_chars.is_empty() {
-        let prefix = format!("{}{}", argc_prefix, argc_filter);
+        let prefix = format!("{argc_prefix}{argc_filter}");
         let prefix = match unbalance_quote(&prefix) {
             Some((_, i)) => prefix.chars().take(i.saturating_sub(1)).collect(),
             None => prefix,
@@ -569,7 +569,7 @@ impl ArgcPathValue {
                 continue;
             }
             let path_value = if is_dir {
-                format!("{value_prefix}{file_name}{}", path_sep)
+                format!("{value_prefix}{file_name}{path_sep}")
             } else {
                 format!("{value_prefix}{file_name}{suffix}")
             };
@@ -638,7 +638,7 @@ impl ArgcPathValue {
                     cwd = runtime.chdir(&cwd, cd)?;
                 }
                 let trims = cwd.len() + 1;
-                let new_value = format!("{}{sep}{value}", cwd).replace('\\', "/");
+                let new_value = format!("{cwd}{sep}{value}").replace('\\', "/");
                 (new_value, trims, FILE_PROTO.into())
             }
         } else if is_home || value.starts_with(home_p) {
@@ -657,7 +657,7 @@ impl ArgcPathValue {
             (path_s, trims, prefix.into())
         } else if value.starts_with(sep) {
             let new_value = if is_windows_mode {
-                format!("C:{}", value)
+                format!("C:{value}")
             } else {
                 value.clone()
             };
@@ -679,7 +679,7 @@ impl ArgcPathValue {
             if let Some(cd) = cd {
                 cwd = runtime.chdir(&cwd, cd)?;
             }
-            let new_value = format!("{}{sep}{new_value}", cwd);
+            let new_value = format!("{cwd}{sep}{new_value}");
             let trims = cwd.len() + 1;
             (new_value, trims, prefix.to_string())
         };
diff --git a/src/mangen.rs b/src/mangen.rs
@@ -155,7 +155,7 @@ fn render_subcommands_section(roff: &mut Roff, cmd: &Command, section: &str) {
     for subcmd in &cmd.subcommands {
         roff.control("TP", []);
         let name = subcmd.full_name();
-        roff.text([roman(format!("{}({})", name, section))]);
+        roff.text([roman(format!("{name}({section})"))]);
         for line in subcmd.describe.lines() {
             roff.text([roman(line)]);
         }
diff --git a/src/matcher.rs b/src/matcher.rs
@@ -1393,15 +1393,15 @@ fn comp_symbol(cmd: &Command, ch: char) -> Vec<CompItem> {
         match choices_fn {
             Some(choices_fn) => {
                 vec![(
-                    format!("__argc_fn={}", choices_fn),
+                    format!("__argc_fn={choices_fn}"),
                     String::new(),
                     false,
                     CompColor::of_value(),
                 )]
             }
             None => {
                 vec![(
-                    format!("__argc_value={}", name),
+                    format!("__argc_value={name}"),
                     String::new(),
                     false,
                     CompColor::of_value(),
@@ -1444,21 +1444,21 @@ fn comp_param(describe: &str, value_name: &str, data: &ParamData) -> Vec<CompIte
                 .map(|v| (v.to_string(), String::new(), false, CompColor::of_value()))
                 .collect(),
             Either::Right(choices_fn) => vec![(
-                format!("__argc_fn={}", choices_fn),
+                format!("__argc_fn={choices_fn}"),
                 String::new(),
                 false,
                 CompColor::of_value(),
             )],
         }
     } else {
-        let value = format!("__argc_value={}", value_name);
+        let value = format!("__argc_value={value_name}");
         vec![(value, describe.into(), false, CompColor::of_value())]
     };
     if let Some(ch) = data.args_delimiter() {
         output.insert(
             0,
             (
-                format!("__argc_multi={}", ch),
+                format!("__argc_multi={ch}"),
                 String::new(),
                 false,
                 CompColor::of_value(),
diff --git a/src/param.rs b/src/param.rs
@@ -150,7 +150,7 @@ impl Param for FlagOptionParam {
         }
 
         for raw_notation in &self.raw_notations {
-            output.push(format!("<{}>", raw_notation));
+            output.push(format!("<{raw_notation}>"));
         }
 
         if !self.data.describe.is_empty() {
@@ -184,7 +184,7 @@ impl FlagOptionParam {
         }
         let name = data.name.clone();
         let id = if long_prefix.starts_with('+') {
-            format!("plus_{}", name)
+            format!("plus_{name}")
         } else {
             name.clone()
         };
@@ -552,7 +552,7 @@ impl Param for PositionalParam {
             }
         }
         if let Some(raw_notation) = self.raw_notation.as_ref() {
-            output.push(format!("<{}>", raw_notation));
+            output.push(format!("<{raw_notation}>"));
         }
         if !self.data.describe.is_empty() {
             output.push(self.data.describe.clone());
@@ -891,7 +891,7 @@ impl ParamData {
             .iter()
             .map(|value| {
                 if value.chars().any(is_choice_value_terminate) {
-                    format!("\"{}\"", value)
+                    format!("\"{value}\"")
                 } else {
                     value.to_string()
                 }
@@ -902,7 +902,7 @@ impl ParamData {
 
     fn render_default_value(value: &str) -> String {
         if value.chars().any(is_default_value_terminate) {
-            format!("\"{}\"", value)
+            format!("\"{value}\"")
         } else {
             value.to_string()
         }
diff --git a/src/parser.rs b/src/parser.rs
@@ -377,7 +377,7 @@ fn parse_with_long_flag_name(input: &str) -> nom::IResult<&str, ParamData> {
 fn parse_no_long_flag_name(input: &str) -> nom::IResult<&str, ParamData> {
     fn parser(input: &str) -> nom::IResult<&str, ParamData> {
         map(satisfy(is_short_char), |ch| {
-            ParamData::new(&format!("{}", ch))
+            ParamData::new(&format!("{ch}"))
         })(input)
     }
     map(pair(parser, opt(tag("*"))), |(mut arg, multiple)| {
diff --git a/src/runtime/mod.rs b/src/runtime/mod.rs
@@ -90,9 +90,9 @@ where
             .and_then(|exe_path| self.parent_path(&exe_path))
         {
             if self.is_windows() {
-                path_env = format!("{};{}", exe_dir, path_env)
+                path_env = format!("{exe_dir};{path_env}")
             } else {
-                path_env = format!("{}:{}", exe_dir, path_env)
+                path_env = format!("{exe_dir}:{path_env}")
             }
         }
         path_env
diff --git a/src/shell.rs b/src/shell.rs
@@ -134,7 +134,7 @@ impl Shell {
                             value
                         };
                         if i == 0 && add_space_to_first_candidate {
-                            new_value = format!(" {}", new_value)
+                            new_value = format!(" {new_value}")
                         };
                         let description = self.comp_description(&description, "(", ")");
                         if description.is_empty() {
@@ -492,7 +492,7 @@ impl Shell {
             description
         } else {
             let truncated: String = description.chars().take(max_width).collect();
-            format!("{}...", truncated)
+            format!("{truncated}...")
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ impl ArgcValue {`
`77`	`77`	`}`
`78`	`78`	`ArgcValue::PositionalSingleFn(id, fn_name) => {`
`79`	`79`	list.push(format!("{}=`{}`", argc_var_name(id), &fn_name));
`80`		- positional_args.push(format!("`{}`", fn_name));
	`80`	+ positional_args.push(format!("`{fn_name}`"));
`81`	`81`	`}`
`82`	`82`	`ArgcValue::PositionalMultiple(id, values) => {`
`83`	`83`	`let values = values`
`@@ -98,7 +98,7 @@ impl ArgcValue {`
`98`	`98`	`list.push(format!("export {}={}", name, escape_shell_words(value)));`
`99`	`99`	`}`
`100`	`100`	`ArgcValue::EnvFn(id, fn_name) => {`
`101`		- list.push(format!("export {}=`{}`", id, fn_name,));
	`101`	+ list.push(format!("export {id}=`{fn_name}`",));
`102`	`102`	`}`
`103`	`103`	`ArgcValue::Hook((before, after)) => {`
`104`	`104`	`if *before {`
`@@ -122,7 +122,7 @@ impl ArgcValue {`
`122`	`122`	`} else {`
`123`	`123`	`last = format!("{} {}", name, positional_args.join(" "));`
`124`	`124`	`}`
`125`		`- list.push(format!("{}_fn={}", VARIABLE_PREFIX, name));`
	`125`	`+ list.push(format!("{VARIABLE_PREFIX}_fn={name}"));`
`126`	`126`	`}`
`127`	`127`	`ArgcValue::ParamFn(name) => {`
`128`	`128`	`if positional_args.is_empty() {`
`@@ -133,7 +133,7 @@ impl ArgcValue {`
`133`	`133`	`exit = true;`
`134`	`134`	`}`
`135`	`135`	`ArgcValue::Error((error, exit)) => {`
`136`		`- return format!("command cat >&2 <<-'EOF' \n{}\nEOF\nexit {}", error, exit)`
	`136`	`+ return format!("command cat >&2 <<-'EOF' \n{error}\nEOF\nexit {exit}")`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ impl NamesChecker {`
`24`	`24`	`bail!("{}", Self::conflict_error(tag_name, pos, name, *exist_pos));`
`25`	`25`	`}`
`26`	`26`	`self.flag_options`
`27`		`- .insert(name.to_string(), (pos, format!("{} {}", tag_name, name)));`
	`27`	`+ .insert(name.to_string(), (pos, format!("{tag_name} {name}")));`
`28`	`28`	`}`
`29`	`29`	`Ok(())`
`30`	`30`	`}`
`@@ -63,9 +63,6 @@ impl NamesChecker {`
`63`	`63`	`name_desc: &str,`
`64`	`64`	`exist_pos: Position,`
`65`	`65`	`) -> String {`
`66`		`- format!(`
`67`		`- "{}(line {}) has '{}' already exists at line {}",`
`68`		`- tag_name, pos, name_desc, exist_pos,`
`69`		`- )`
	`66`	`+ format!("{tag_name}(line {pos}) has '{name_desc}' already exists at line {exist_pos}",)`
`70`	`67`	`}`
`71`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ fn render_subcommands_section(roff: &mut Roff, cmd: &Command, section: &str) {`
`155`	`155`	`for subcmd in &cmd.subcommands {`
`156`	`156`	`roff.control("TP", []);`
`157`	`157`	`let name = subcmd.full_name();`
`158`		`- roff.text([roman(format!("{}({})", name, section))]);`
	`158`	`+ roff.text([roman(format!("{name}({section})"))]);`
`159`	`159`	`for line in subcmd.describe.lines() {`
`160`	`160`	`roff.text([roman(line)]);`
`161`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ impl Param for FlagOptionParam {`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`for raw_notation in &self.raw_notations {`
`153`		`- output.push(format!("<{}>", raw_notation));`
	`153`	`+ output.push(format!("<{raw_notation}>"));`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`if !self.data.describe.is_empty() {`
`@@ -184,7 +184,7 @@ impl FlagOptionParam {`
`184`	`184`	`}`
`185`	`185`	`let name = data.name.clone();`
`186`	`186`	`let id = if long_prefix.starts_with('+') {`
`187`		`- format!("plus_{}", name)`
	`187`	`+ format!("plus_{name}")`
`188`	`188`	`} else {`
`189`	`189`	`name.clone()`
`190`	`190`	`};`
`@@ -552,7 +552,7 @@ impl Param for PositionalParam {`
`552`	`552`	`}`
`553`	`553`	`}`
`554`	`554`	`if let Some(raw_notation) = self.raw_notation.as_ref() {`
`555`		`- output.push(format!("<{}>", raw_notation));`
	`555`	`+ output.push(format!("<{raw_notation}>"));`
`556`	`556`	`}`
`557`	`557`	`if !self.data.describe.is_empty() {`
`558`	`558`	`output.push(self.data.describe.clone());`
`@@ -891,7 +891,7 @@ impl ParamData {`
`891`	`891`	`.iter()`
`892`	`892`	`.map(\|value\| {`
`893`	`893`	`if value.chars().any(is_choice_value_terminate) {`
`894`		`- format!("\"{}\"", value)`
	`894`	`+ format!("\"{value}\"")`
`895`	`895`	`} else {`
`896`	`896`	`value.to_string()`
`897`	`897`	`}`
`@@ -902,7 +902,7 @@ impl ParamData {`
`902`	`902`
`903`	`903`	`fn render_default_value(value: &str) -> String {`
`904`	`904`	`if value.chars().any(is_default_value_terminate) {`
`905`		`- format!("\"{}\"", value)`
	`905`	`+ format!("\"{value}\"")`
`906`	`906`	`} else {`
`907`	`907`	`value.to_string()`
`908`	`908`	`}`
Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,7 @@ fn parse_with_long_flag_name(input: &str) -> nom::IResult<&str, ParamData> {`
`377`	`377`	`fn parse_no_long_flag_name(input: &str) -> nom::IResult<&str, ParamData> {`
`378`	`378`	`fn parser(input: &str) -> nom::IResult<&str, ParamData> {`
`379`	`379`	`map(satisfy(is_short_char), \|ch\| {`
`380`		`- ParamData::new(&format!("{}", ch))`
	`380`	`+ ParamData::new(&format!("{ch}"))`
`381`	`381`	`})(input)`
`382`	`382`	`}`
`383`	`383`	`map(pair(parser, opt(tag("*"))), \|(mut arg, multiple)\| {`
Original file line number	Diff line number	Diff line change
`@@ -90,9 +90,9 @@ where`
`90`	`90`	`.and_then(\|exe_path\| self.parent_path(&exe_path))`
`91`	`91`	`{`
`92`	`92`	`if self.is_windows() {`
`93`		`- path_env = format!("{};{}", exe_dir, path_env)`
	`93`	`+ path_env = format!("{exe_dir};{path_env}")`
`94`	`94`	`} else {`
`95`		`- path_env = format!("{}:{}", exe_dir, path_env)`
	`95`	`+ path_env = format!("{exe_dir}:{path_env}")`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`	`path_env`