From f48261a2a2d3cc94aad1ba34e2baf54c49c091d5 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Tue, 12 Oct 2021 11:14:15 -0500
Subject: [PATCH] Partial Revert of "Change MissingArgumentOrSubcommand to
 DisplayHelpOnMissingArgumentOrSubcommand and don't use stderr"

This partially reverts commit 7f627fc.

This reverts the error code change but not the `ErrorKind` change.  I
was mixed on whether we should do that or not.  The benefit is it makes
it so people can check the Kind for cases like #2021.  On the other
hand, it doesn't seem that hard to re-implement the feature.

Fixes #2767
---
 src/parse/errors.rs   | 4 +---
 tests/app_settings.rs | 7 +++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/parse/errors.rs b/src/parse/errors.rs
index 0b98255babd..bc476ecb6c6 100644
--- 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
index 8fae6107ed0..655e8bffe41 100644
--- 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
     ));
 }