Merge pull request #206 from Alexendoo/fix-cli

Fix the CLI requiring the help argument

Author: oli-obk

.github/workflows/ci.yml

@@ -31,4 +31,4 @@ jobs:
     - name: Verify that binary works
       run: |
         cargo run -- bisect-rustc --help | grep "EXAMPLES:"
-        cargo run -- --help | grep "EXAMPLES:"
+        cargo run -- --help | grep "SUBCOMMANDS:"

src/main.rs

@@ -57,11 +57,7 @@ const REPORT_HEADER: &str = "\
 ==================================================================================";
 
 #[derive(Debug, Parser)]
-#[clap(
-    bin_name = "cargo",
-    disable_help_flag = true,
-    subcommand_required = true
-)]
+#[clap(bin_name = "cargo", subcommand_required = true)]
 enum Cargo {
     BisectRustc(Opts),
 }
@@ -85,9 +81,6 @@ enum Cargo {
 )]
 #[allow(clippy::struct_excessive_bools)]
 struct Opts {
-    #[clap(long, short, action = clap::builder::ArgAction::Help, help = "Print help information")]
-    help: bool,
-
     #[clap(
         long,
         help = "Custom regression definition",

tests/cmd/h.sterr tests/cmd/bare-h.stderrtests/cmd/h.sterr renamed to tests/cmd/bare-h.stderr

@@ -0,0 +1,11 @@
+cargo-bisect-rustc 
+
+USAGE:
+    cargo <SUBCOMMAND>
+
+OPTIONS:
+    -h, --help    Print help information
+
+SUBCOMMANDS:
+    bisect-rustc    Bisects rustc toolchains with rustup
+    help            Print this message or the help of the given subcommand(s)

tests/cmd/bare-h.stdout

@@ -0,0 +1,2 @@
+bin.name = "cargo-bisect-rustc"
+args = "-h"

tests/cmd/bare-h.toml

@@ -0,0 +1,11 @@
+cargo-bisect-rustc 
+
+USAGE:
+    cargo <SUBCOMMAND>
+
+OPTIONS:
+    -h, --help    Print help information
+
+SUBCOMMANDS:
+    bisect-rustc    Bisects rustc toolchains with rustup
+    help            Print this message or the help of the given subcommand(s)

tests/cmd/bare-help.stderr

@@ -0,0 +1,2 @@
+bin.name = "cargo-bisect-rustc"
+args = "--help"

tests/cmd/bare-help.stdout

@@ -1,2 +1,2 @@
 bin.name = "cargo-bisect-rustc"
-args = "-h"
+args = "bisect-rustc -h"

tests/cmd/bare-help.toml

@@ -1,2 +1,2 @@
 bin.name = "cargo-bisect-rustc"
-args = "--help"
+args = "bisect-rustc --help"