From 2604975404c08b4dabf475f7318b3891a1158a4d Mon Sep 17 00:00:00 2001
From: rami3l <rami3l@outlook.com>
Date: Tue, 25 Jun 2024 14:01:30 +0800
Subject: [PATCH] fix(rustup-mode): improve `clap` error format

---
 src/cli/rustup_mode.rs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/cli/rustup_mode.rs b/src/cli/rustup_mode.rs
index 5de45f0760..1efe74bb2b 100644
--- a/src/cli/rustup_mode.rs
+++ b/src/cli/rustup_mode.rs
@@ -529,7 +529,7 @@ pub async fn main(current_dir: PathBuf, process: &Process) -> Result<utils::Exit
 
     use clap::error::ErrorKind::*;
     let matches = match Rustup::try_parse_from(process.args_os()) {
-        Ok(matches) => Ok(matches),
+        Ok(matches) => matches,
         Err(err) if err.kind() == DisplayHelp => {
             write!(process.stdout().lock(), "{err}")?;
             return Ok(utils::ExitCode(0));
@@ -554,15 +554,12 @@ pub async fn main(current_dir: PathBuf, process: &Process) -> Result<utils::Exit
             .contains(&err.kind())
             {
                 write!(process.stdout().lock(), "{err}")?;
-                return Ok(utils::ExitCode(1));
-            }
-            if err.kind() == ValueValidation && err.to_string().contains(TOOLCHAIN_OVERRIDE_ERROR) {
+            } else {
                 write!(process.stderr().lock(), "{err}")?;
-                return Ok(utils::ExitCode(1));
             }
-            Err(err)
+            return Ok(utils::ExitCode(1));
         }
-    }?;
+    };
 
     let cfg = &mut common::set_globals(current_dir, matches.verbose, matches.quiet, process)?;