Upgrade to clap 3.0.0-beta.5

Cargo.toml

@@ -13,10 +13,10 @@ repository = "https://github.com/bruceadams/yj"
 
 [dependencies]
 exitfailure = "0.5.1"
-serde_json = "1.0.67"
-serde_yaml = "0.8.20"
+serde_json = "1.0.68"
+serde_yaml = "0.8.21"
 snafu = "0.6.10"
 
 [dependencies.clap]
 features = ["wrap_help"]
-version = "3.0.0-beta.4"
+version = "3.0.0-beta.5"

src/main.rs

@@ -1,4 +1,4 @@
-use clap::{crate_description, crate_version, AppSettings::ColoredHelp, Clap};
+use clap::{crate_description, crate_version, Parser};
 use exitfailure::ExitFailure;
 use snafu::{ResultExt, Snafu};
 use std::{
@@ -51,15 +51,15 @@ enum Error {
     },
 }
 
-#[derive(Clap, Clone, Debug)]
-#[clap(global_setting = ColoredHelp, about=crate_description!(), version=crate_version!())]
+#[derive(Clone, Debug, Parser)]
+#[clap(about=crate_description!(), version=crate_version!())]
 struct MyArgs {
     /// Use compact formatting for the JSON output.
-    #[clap(long = "compact", short = 'c')]
+    #[clap(long, short)]
     compact: bool,
 
     /// Format the output as YAML instead of JSON.
-    #[clap(long = "yaml", short = 'y')]
+    #[clap(long, short)]
     yaml: bool,
 
     /// Parse the input as JSON.
@@ -68,11 +68,11 @@ struct MyArgs {
     /// correctly even when being handled with the YAML parser.
     /// Use this option when you want failure (instead of weird results)
     /// when the input is invalid JSON.
-    #[clap(long = "json", short = 'j')]
+    #[clap(long, short)]
     json: bool,
 
     /// Output file name for the JSON. Defaults to stdout.
-    #[clap(long = "output", parse(from_os_str), short = 'o')]
+    #[clap(long, parse(from_os_str), short)]
     output: Option<PathBuf>,
 
     /// Input YAML file name. Defaults to stdin.