Merge clap-rs#2859

2859: Partial Revert of "Change MissingArgumentOrSubcommand to DisplayHelpO… r=pksunkara a=epage Co-authored-by: Ed Page <[email protected]>
epage · Oct 12, 2021 · 5f3fe49 · 5f3fe49
2 parents 93decf7 + f48261a
commit 5f3fe49
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/parse/errors.rs b/src/parse/errors.rs
@@ -491,9 +491,7 @@ impl Error {
     pub fn use_stderr(&self) -> bool {
         !matches!(
             self.kind,
-            ErrorKind::DisplayHelp
-                | ErrorKind::DisplayVersion
-                | ErrorKind::DisplayHelpOnMissingArgumentOrSubcommand
+            ErrorKind::DisplayHelp | ErrorKind::DisplayVersion
         )
     }
 

diff --git a/tests/app_settings.rs b/tests/app_settings.rs
@@ -260,6 +260,7 @@ fn arg_required_else_help() {
         .setting(AppSettings::ArgRequiredElseHelp)
         .arg(Arg::new("test").index(1))
         .try_get_matches_from(vec![""]);
+
     assert!(result.is_err());
     let err = result.err().unwrap();
     assert_eq!(
@@ -274,6 +275,7 @@ fn arg_required_else_help_over_reqs() {
         .setting(AppSettings::ArgRequiredElseHelp)
         .arg(Arg::new("test").index(1).required(true))
         .try_get_matches_from(vec![""]);
+
     assert!(result.is_err());
     let err = result.err().unwrap();
     assert_eq!(
@@ -297,7 +299,7 @@ fn arg_required_else_help_error_message() {
         app,
         "test",
         ARG_REQUIRED_ELSE_HELP,
-        false
+        true // Unlike normal displaying of help, we should provide a fatal exit code
     ));
 }
 
@@ -307,6 +309,7 @@ fn subcommand_required_else_help() {
         .setting(AppSettings::SubcommandRequiredElseHelp)
         .subcommand(App::new("info"))
         .try_get_matches_from(&[""]);
+
     assert!(result.is_err());
     let err = result.err().unwrap();
     assert_eq!(
@@ -325,7 +328,7 @@ fn subcommand_required_else_help_error_message() {
         app,
         "test",
         SUBCOMMAND_REQUIRED_ELSE_HELP,
-        false
+        true // Unlike normal displaying of help, we should provide a fatal exit code
     ));
 }