cli: Ensure help is actually displayed

Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>

Author: kinnison

src/cli/rustup_mode.rs

@@ -61,7 +61,8 @@ pub fn main() -> Result<utils::ExitCode> {
             if e.kind == clap::ErrorKind::HelpDisplayed
                 || e.kind == clap::ErrorKind::VersionDisplayed =>
         {
-            return Ok(utils::ExitCode(0))
+            writeln!(process().stdout().lock(), "{}", e.message)?;
+            return Ok(utils::ExitCode(0));
         }
         Err(e) => Err(e),
     }?;

src/cli/setup_mode.rs

@@ -98,7 +98,8 @@ pub fn main() -> Result<utils::ExitCode> {
             if e.kind == clap::ErrorKind::HelpDisplayed
                 || e.kind == clap::ErrorKind::VersionDisplayed =>
         {
-            return Ok(utils::ExitCode(0))
+            writeln!(process().stdout().lock(), "{}", e.message)?;
+            return Ok(utils::ExitCode(0));
         }
         Err(e) => Err(e)?,
     };