feat(help): Show short aliases before long ones

This is consistent with the order of the short and long argument
variants at the start of each line.

Author: cenviity

clap_builder/src/output/help_template.rs

@@ -786,30 +786,30 @@ impl HelpTemplate<'_, '_> {
         }
 
         let als = a
-            .aliases
+            .short_aliases
             .iter()
             .filter(|&als| als.1) // visible
-            .map(|als| format!("--{}", als.0)) // name
+            .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}]"));
+            debug!(
+                "HelpTemplate::spec_vals: Found short aliases...{:?}",
+                a.short_aliases
+            );
+            spec_vals.push(format!("[short aliases: {als}]"));
         }
 
         let als = a
-            .short_aliases
+            .aliases
             .iter()
             .filter(|&als| als.1) // visible
-            .map(|&als| format!("-{}", als.0)) // name
+            .map(|als| format!("--{}", als.0)) // name
             .collect::<Vec<_>>()
             .join(", ");
         if !als.is_empty() {
-            debug!(
-                "HelpTemplate::spec_vals: Found short aliases...{:?}",
-                a.short_aliases
-            );
-            spec_vals.push(format!("[short aliases: {als}]"));
+            debug!("HelpTemplate::spec_vals: Found aliases...{:?}", a.aliases);
+            spec_vals.push(format!("[aliases: {als}]"));
         }
 
         if !a.is_hide_possible_values_set() && !self.use_long_pv(a) {

tests/builder/arg_aliases_short.rs

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