imp: if all subcommands are hidden, the subcommands section of the he…

…lp message is no longer displayed Closes #1046
clap-rs · Sep 14, 2017 · 4ae7b04 · 4ae7b04
1 parent e1319fa
commit 4ae7b04
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/app/help.rs b/src/app/help.rs
@@ -521,7 +521,7 @@ impl<'a> Help<'a> {
             .filter(|arg| !arg.is_set(ArgSettings::Hidden))
             .count() > 0;
         let opts = parser.has_opts();
-        let subcmds = parser.has_subcommands();
+        let subcmds = parser.has_visible_subcommands();
 
         let unified_help = parser.is_set(AppSettings::UnifiedHelpMessage);
 

diff --git a/src/app/parser.rs b/src/app/parser.rs
@@ -475,10 +475,7 @@ impl<'a, 'b> Parser<'a, 'b>
 
     #[inline]
     pub fn has_visible_subcommands(&self) -> bool {
-        if self.subcommands.is_empty() {
-            return false;
-        }
-        self.subcommands.iter().any(|s| !s.p.is_set(AS::Hidden))
+        self.has_subcommands() && self.subcommands.iter().filter(|sc| sc.p.meta.name != "help").any(|sc| !sc.p.is_set(AS::Hidden))
     }
 
     #[inline]