From 43618954766a2ba525541501422bb6e7d5ccc913 Mon Sep 17 00:00:00 2001
From: Luca Casonato <lucacasonato@yahoo.com>
Date: Sat, 9 Jan 2021 13:08:03 +0100
Subject: fix: don't error on version and help flag (#9064)

---
 cli/main.rs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'cli/main.rs')

diff --git a/cli/main.rs b/cli/main.rs
index a3b8f3a6d..c9644073b 100644
--- a/cli/main.rs
+++ b/cli/main.rs
@@ -1261,8 +1261,17 @@ pub fn main() {
     std::process::exit(1);
   }
 
-  let flags =
-    unwrap_or_exit(flags::flags_from_vec(args).map_err(AnyError::from));
+  let flags = match flags::flags_from_vec(args) {
+    Ok(flags) => flags,
+    Err(err @ clap::Error { .. })
+      if err.kind == clap::ErrorKind::HelpDisplayed
+        || err.kind == clap::ErrorKind::VersionDisplayed =>
+    {
+      err.write_to(&mut std::io::stdout()).unwrap();
+      std::process::exit(0);
+    }
+    Err(err) => unwrap_or_exit(Err(AnyError::from(err))),
+  };
   if !flags.v8_flags.is_empty() {
     init_v8_flags(&*flags.v8_flags);
   }
-- 
cgit v1.2.3