Update to latest clap 3.0.0-rc.7

Author: fornwall

Cargo.lock

@@ -20,7 +20,7 @@ exclude = [
 ]
 
 [dependencies]
-clap = "3.0.0-beta.5"
+clap = "3.0.0-rc.7"
 dirs-next = "2"
 env_logger = "0.9"
 lazy_static = "1"

Cargo.toml

@@ -98,11 +98,12 @@ fn parse_args() -> Args {
 
     let app = App::new(consts::PROGRAM_NAME)
         .version(version)
-        .setting(clap::AppSettings::TrailingVarArg)
         .about(about)
+        .setting(clap::AppSettings::TrailingVarArg)
+        //.override_help(about)
             .arg(Arg::new("script")
                 .index(1)
-                .about("Script file or expression to execute.")
+                .help("Script file or expression to execute.")
                 .required_unless_present_any(if cfg!(windows) {
                     vec!["clear-cache", "list-templates", "install-file-association", "uninstall-file-association"]
                 } else {
@@ -116,14 +117,14 @@ fn parse_args() -> Args {
                 .multiple_values(true)
             )
             .arg(Arg::new("expr")
-                .about("Execute <script> as a literal expression and display the result.")
+                .help("Execute <script> as a literal expression and display the result.")
                 .long("expr")
                 .short('e')
                 .takes_value(false)
                 .requires("script")
             )
             .arg(Arg::new("loop")
-                .about("Execute <script> as a literal closure once for each line from stdin.")
+                .help("Execute <script> as a literal closure once for each line from stdin.")
                 .long("loop")
                 .short('l')
                 .takes_value(false)
@@ -136,51 +137,51 @@ fn parse_args() -> Args {
             Options that impact the script being executed.
             */
             .arg(Arg::new("cargo-output")
-                .about("Show output from cargo when building.")
+                .help("Show output from cargo when building.")
                 .short('o')
                 .long("cargo-output")
                 .requires("script")
             )
             .arg(Arg::new("count")
-                .about("Invoke the loop closure with two arguments: line, and line number.")
+                .help("Invoke the loop closure with two arguments: line, and line number.")
                 .long("count")
                 .requires("loop")
             )
             .arg(Arg::new("debug")
-                .about("Build a debug executable, not an optimised one.")
+                .help("Build a debug executable, not an optimised one.")
                 .long("debug")
             )
             .arg(Arg::new("dep")
-                .about("Add an additional Cargo dependency. Each SPEC can be either just the package name (which will assume the latest version) or a full `name=version` spec.")
+                .help("Add an additional Cargo dependency. Each SPEC can be either just the package name (which will assume the latest version) or a full `name=version` spec.")
                 .long("dep")
                 .short('d')
                 .takes_value(true)
                 .multiple_occurrences(true)
                 .number_of_values(1)
             )
             .arg(Arg::new("dep_extern")
-                .about("Like `dep`, except that it *also* adds a `#[macro_use] extern crate name;` item for expression and loop scripts. Note that this only works if the name of the dependency and the name of the library it generates are exactly the same.")
+                .help("Like `dep`, except that it *also* adds a `#[macro_use] extern crate name;` item for expression and loop scripts. Note that this only works if the name of the dependency and the name of the library it generates are exactly the same.")
                 .long("dep-extern")
                 .short('D')
                 .takes_value(true)
                 .multiple_occurrences(true)
                 .requires("expr_or_loop")
             )
             .arg(Arg::new("extern")
-                .about("Adds an `#[macro_use] extern crate name;` item for expressions and loop scripts.")
+                .help("Adds an `#[macro_use] extern crate name;` item for expressions and loop scripts.")
                 .long("extern")
                 .short('x')
                 .takes_value(true)
                 .multiple_occurrences(true)
                 .requires("expr_or_loop")
             )
             .arg(Arg::new("features")
-                 .about("Cargo features to pass when building and running.")
+                 .help("Cargo features to pass when building and running.")
                  .long("features")
                  .takes_value(true)
             )
             .arg(Arg::new("unstable_features")
-                .about("Add a #![feature] declaration to the crate.")
+                .help("Add a #![feature] declaration to the crate.")
                 .long("unstable-feature")
                 .short('u')
                 .takes_value(true)
@@ -192,46 +193,46 @@ fn parse_args() -> Args {
             Options that change how rust-script itself behaves, and don't alter what the script will do.
             */
             .arg(Arg::new("clear-cache")
-                .about("Clears out the script cache.")
+                .help("Clears out the script cache.")
                 .long("clear-cache")
             )
             .arg(Arg::new("force")
-                .about("Force the script to be rebuilt.")
+                .help("Force the script to be rebuilt.")
                 .long("force")
                 .requires("script")
             )
             .arg(Arg::new("gen_pkg_only")
-                .about("Generate the Cargo package, but don't compile or run it.")
+                .help("Generate the Cargo package, but don't compile or run it.")
                 .long("gen-pkg-only")
                 .requires("script")
                 .conflicts_with_all(&["debug", "force", "test", "bench"])
             )
             .arg(Arg::new("pkg_path")
-                .about("Specify where to place the generated Cargo package.")
+                .help("Specify where to place the generated Cargo package.")
                 .long("pkg-path")
                 .takes_value(true)
                 .requires("script")
                 .conflicts_with_all(&["clear-cache", "force"])
             )
             .arg(Arg::new("test")
-                .about("Compile and run tests.")
+                .help("Compile and run tests.")
                 .long("test")
                 .conflicts_with_all(&["bench", "debug", "force"])
             )
             .arg(Arg::new("bench")
-                .about("Compile and run benchmarks. Requires a nightly toolchain.")
+                .help("Compile and run benchmarks. Requires a nightly toolchain.")
                 .long("bench")
                 .conflicts_with_all(&["test", "debug", "force"])
             )
             .arg(Arg::new("template")
-                .about("Specify a template to use for expression scripts.")
+                .help("Specify a template to use for expression scripts.")
                 .long("template")
                 .short('t')
                 .takes_value(true)
                 .requires("expr")
             )
             .arg(Arg::new("toolchain-version")
-                .about("Build the script using the given toolchain version.")
+                .help("Build the script using the given toolchain version.")
                 .long("toolchain-version")
                 // "channel"
                 .short('c')
@@ -240,7 +241,7 @@ fn parse_args() -> Args {
                 .conflicts_with("bench")
             )
         .arg(Arg::new("list-templates")
-            .about("List the available templates.")
+            .help("List the available templates.")
             .long("list-templates")
             .takes_value(false)
         );
@@ -249,12 +250,12 @@ fn parse_args() -> Args {
     let app = app
         .arg(
             Arg::new("install-file-association")
-                .about("Install a file association so that rust-script executes .ers files.")
+                .help("Install a file association so that rust-script executes .ers files.")
                 .long("install-file-association"),
         )
         .arg(
             Arg::new("uninstall-file-association")
-                .about("Uninstall the file association that makes rust-script execute .ers files.")
+                .help("Uninstall the file association that makes rust-script execute .ers files.")
                 .long("uninstall-file-association"),
         )
         .group(