Merge pull request #5999 from cenviity/push-tqqzyttsoktu

feat(help): Merge lists of short and long aliases

Author: epage

clap_builder/src/output/help_template.rs

@@ -785,31 +785,29 @@ impl HelpTemplate<'_, '_> {
             spec_vals.push(format!("[default: {pvs}]"));
         }
 
-        let als = a
-            .aliases
+        let mut als = Vec::new();
+
+        let short_als = a
+            .short_aliases
             .iter()
             .filter(|&als| als.1) // visible
-            .map(|als| format!("--{}", als.0)) // name
-            .collect::<Vec<_>>()
-            .join(", ");
-        if !als.is_empty() {
-            debug!("HelpTemplate::spec_vals: Found aliases...{:?}", a.aliases);
-            spec_vals.push(format!("[aliases: {als}]"));
-        }
+            .map(|als| format!("-{}", als.0)); // name
+        debug!(
+            "HelpTemplate::spec_vals: Found short aliases...{:?}",
+            a.short_aliases
+        );
+        als.extend(short_als);
 
-        let als = a
-            .short_aliases
+        let long_als = a
+            .aliases
             .iter()
             .filter(|&als| als.1) // visible
-            .map(|&als| format!("-{}", als.0)) // name
-            .collect::<Vec<_>>()
-            .join(", ");
+            .map(|als| format!("--{}", als.0)); // name
+        debug!("HelpTemplate::spec_vals: Found aliases...{:?}", a.aliases);
+        als.extend(long_als);
+
         if !als.is_empty() {
-            debug!(
-                "HelpTemplate::spec_vals: Found short aliases...{:?}",
-                a.short_aliases
-            );
-            spec_vals.push(format!("[short aliases: {als}]"));
+            spec_vals.push(format!("[aliases: {}]", als.join(", ")));
         }
 
         if !a.is_hide_possible_values_set() && !self.use_long_pv(a) {

tests/builder/arg_aliases_short.rs

@@ -193,8 +193,8 @@ Some help
 Usage: ct test [OPTIONS]
 
 Options:
-  -o, --opt <opt>  [short aliases: -v]
-  -f, --flag       [aliases: --flag1] [short aliases: -a, -b, -🦆]
+  -o, --opt <opt>  [aliases: -v]
+  -f, --flag       [aliases: -a, -b, -🦆, --flag1]
   -h, --help       Print help
   -V, --version    Print version
 ";