fix formatting issues

Author: Eric Gumba

clap_builder/src/output/help_template.rs

@@ -19,8 +19,8 @@ use crate::output::wrap;
 use crate::output::Usage;
 use crate::output::TAB;
 use crate::output::TAB_WIDTH;
-use crate::util::FlatSet;
 use crate::util::sort::{option_sort_key, subcmd_sort_key};
+use crate::util::FlatSet;
 
 /// `clap` auto-generated help writer
 pub(crate) struct AutoHelp<'cmd, 'writer> {

clap_builder/src/util/mod.rs

@@ -3,9 +3,9 @@
 mod any_value;
 pub(crate) mod flat_map;
 pub(crate) mod flat_set;
-pub(crate) mod sort;
 mod graph;
 mod id;
+pub(crate) mod sort;
 mod str_to_bool;
 
 pub use self::id::Id;

clap_builder/src/util/sort.rs

@@ -1,7 +1,8 @@
 use crate::{builder::Arg, Command};
 
 /// Provides consistent sorting for options in help/man output
-pub fn option_sort_key(arg: &Arg) -> (usize, String) {
+#[allow(dead_code)]
+pub(crate) fn option_sort_key(arg: &Arg) -> (usize, String) {
     let key = if let Some(x) = arg.get_short() {
         let mut s = x.to_ascii_lowercase().to_string();
         s.push(if x.is_ascii_lowercase() { '0' } else { '1' });
@@ -17,6 +18,7 @@ pub fn option_sort_key(arg: &Arg) -> (usize, String) {
 }
 
 /// Provides consistent sorting for subcommands
-pub fn subcmd_sort_key(subcmd: &Command) -> (usize, &str) {
+#[allow(dead_code)]
+pub(crate) fn subcmd_sort_key(subcmd: &Command) -> (usize, &str) {
     (subcmd.get_display_order(), subcmd.get_name())
-}
+}

clap_mangen/src/render.rs

@@ -1,4 +1,4 @@
-use clap::{Arg, ArgAction, option_sort_key, subcmd_sort_key};
+use clap::{option_sort_key, subcmd_sort_key, Arg, ArgAction};
 use roff::{bold, italic, roman, Inline, Roff};
 
 pub(crate) fn subcommand_heading(cmd: &clap::Command) -> &str {
@@ -206,10 +206,8 @@ fn possible_options(roff: &mut Roff, arg: &Arg, arg_help_written: bool) {
 }
 
 pub(crate) fn subcommands(roff: &mut Roff, cmd: &clap::Command, section: &str) {
-    let mut sorted_subcommands: Vec<_> = cmd
-        .get_subcommands()
-        .filter(|s| !s.is_hide_set())
-        .collect();
+    let mut sorted_subcommands: Vec<_> =
+        cmd.get_subcommands().filter(|s| !s.is_hide_set()).collect();
     sorted_subcommands.sort_by_key(|sub| subcmd_sort_key(sub));
     for sub in sorted_subcommands {
         roff.control("TP", []);