Merge pull request #5615 from epage/wrap

fix(help): Properly wrap subcommand about

clap_builder/src/output/help_template.rs

@@ -650,7 +650,7 @@ impl<'cmd, 'writer> HelpTemplate<'cmd, 'writer> {
 
         let spaces = if next_line_help {
             TAB.len() + NEXT_LINE_INDENT.len()
-        } else if let Some(true) = arg.map(|a| a.is_positional()) {
+        } else if arg.map(|a| a.is_positional()).unwrap_or(true) {
             longest + TAB_WIDTH * 2
         } else {
             longest + TAB_WIDTH * 2 + 4 // See `fn short` for the 4

tests/builder/help.rs

@@ -566,10 +566,19 @@ fn wrapped_help() {
                 .long("no-git-push")
                 .action(ArgAction::SetTrue)
                 .help("Do not push generated commit and tags to git remote"),
+        )
+        .subcommand(
+            Command::new("sub1")
+                .about("One two three four five six seven eight nine ten eleven twelve thirteen fourteen fifteen")
         );
 
     let expected = str![[r#"
-Usage: test [OPTIONS]
+Usage: test [OPTIONS] [COMMAND]
+
+Commands:
+  sub1  One two three four five six seven eight nine ten eleven
+        twelve thirteen fourteen fifteen
+  help  Print this message or the help of the given subcommand(s)
 
 Options:
   -a, --all            Also do versioning for private crates (will
@@ -614,10 +623,19 @@ fn unwrapped_help() {
                 .long("no-git-push")
                 .action(ArgAction::SetTrue)
                 .help("Do not push generated commit and tags to git remote"),
+        )
+        .subcommand(
+            Command::new("sub1")
+                .about("One two three four five six seven eight nine ten eleven twelve thirteen fourteen fifteen")
         );
 
     let expected = str![[r#"
-Usage: test [OPTIONS]
+Usage: test [OPTIONS] [COMMAND]
+
+Commands:
+  sub1  One two three four five six seven eight nine ten eleven
+        twelve thirteen fourteen fifteen
+  help  Print this message or the help of the given subcommand(s)
 
 Options:
   -a, --all            Also do versioning for private crates (will