Add structopt dependency in version 0.3.7

This patch series replaces argparse with structopt in the argument
handling code. As a first step, we need structopt as a dependency.

Import subrepo structopt/:structopt at efbdda4753592e27bc430fb01f7b9650b2f3174d
Import subrepo bitflags/:bitflags at 30668016aca6bd3b02c766e8347e0b4080d4c296
Import subrepo clap/:clap at 784524f7eb193e35f81082cc69454c8c21b948f7
Import subrepo heck/:heck at 093d56fbf001e1506e56dbfa38631d99b1066df1
Import subrepo proc-macro-error/:proc-macro-error at 6c4cfe79a622c5de8ae68557993542be46eacae2
Import subrepo proc-macro2/:proc-macro2 at d5d48eddca4566e5438e8a2cbed4a74e049544de
Import subrepo quote/:quote at 727436c6c137b20f0f34dde5d8fda2679b9747ad
Import subrepo rustversion/:rustversion at 0c5663313516263059ce9059ef81fc7a1cf655ca
Import subrepo syn-mid/:syn-mid at 5d3d85414a9e6674e1857ec22a87b96e04a6851a
Import subrepo syn/:syn at e87c27e87f6f4ef8919d0372bdb056d53ef0d8f3
Import subrepo textwrap/:textwrap at abcd618beae3f74841032aa5b53c1086b0a57ca2
Import subrepo unicode-segmentation/:unicode-segmentation at 637c9874c4fe0c205ff27787faf150a40295c6c3
Import subrepo unicode-width/:unicode-width at 3033826f8bf05e82724140a981d5941e48fce393
Import subrepo unicode-xid/:unicode-xid at 4baae9fffb156ba229665b972a9cd5991787ceb7

1 files changed, 498 insertions, 0 deletions

diff --git a/clap/tests/default_vals.rs b/clap/tests/default_vals.rs
new file mode 100644
index 0000000..0dfd3c8
--- /dev/null
+++ b/clap/tests/default_vals.rs
@@ -0,0 +1,498 @@
+extern crate clap;
+extern crate regex;
+
+include!("../clap-test.rs");
+
+use clap::{App, Arg, ErrorKind};
+
+#[test]
+fn opts() {
+    let r = App::new("df")
+        .arg(
+            Arg::from_usage("-o [opt] 'some opt'").default_value("default"),
+        )
+        .get_matches_from_safe(vec![""]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("o"));
+    assert_eq!(m.value_of("o").unwrap(), "default");
+}
+
+#[test]
+fn opt_user_override() {
+    let r = App::new("df")
+        .arg(
+            Arg::from_usage("--opt [FILE] 'some arg'").default_value("default"),
+        )
+        .get_matches_from_safe(vec!["", "--opt", "value"]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("opt"));
+    assert_eq!(m.value_of("opt").unwrap(), "value");
+}
+
+#[test]
+fn positionals() {
+    let r = App::new("df")
+        .arg(Arg::from_usage("[arg] 'some opt'").default_value("default"))
+        .get_matches_from_safe(vec![""]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("arg"));
+    assert_eq!(m.value_of("arg").unwrap(), "default");
+}
+
+#[test]
+fn positional_user_override() {
+    let r = App::new("df")
+        .arg(Arg::from_usage("[arg] 'some arg'").default_value("default"))
+        .get_matches_from_safe(vec!["", "value"]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("arg"));
+    assert_eq!(m.value_of("arg").unwrap(), "value");
+}
+
+// OsStr Default Values
+
+#[test]
+fn osstr_opts() {
+    use std::ffi::OsStr;
+    let expected = OsStr::new("default");
+
+    let r = App::new("df")
+        .arg(
+            Arg::from_usage("-o [opt] 'some opt'").default_value_os(expected),
+        )
+        .get_matches_from_safe(vec![""]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("o"));
+    assert_eq!(m.value_of("o").unwrap(), expected);
+}
+
+#[test]
+fn osstr_opt_user_override() {
+    use std::ffi::OsStr;
+    let default = OsStr::new("default");
+
+    let r = App::new("df")
+        .arg(
+            Arg::from_usage("--opt [FILE] 'some arg'").default_value_os(default),
+        )
+        .get_matches_from_safe(vec!["", "--opt", "value"]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("opt"));
+    assert_eq!(m.value_of("opt").unwrap(), "value");
+}
+
+#[test]
+fn osstr_positionals() {
+    use std::ffi::OsStr;
+    let expected = OsStr::new("default");
+
+    let r = App::new("df")
+        .arg(
+            Arg::from_usage("[arg] 'some opt'").default_value_os(expected),
+        )
+        .get_matches_from_safe(vec![""]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("arg"));
+    assert_eq!(m.value_of("arg").unwrap(), expected);
+}
+
+#[test]
+fn osstr_positional_user_override() {
+    use std::ffi::OsStr;
+    let default = OsStr::new("default");
+
+    let r = App::new("df")
+        .arg(
+            Arg::from_usage("[arg] 'some arg'").default_value_os(default),
+        )
+        .get_matches_from_safe(vec!["", "value"]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("arg"));
+    assert_eq!(m.value_of("arg").unwrap(), "value");
+}
+
+// --- Default if arg is present
+
+#[test]
+fn default_if_arg_present_no_default() {
+    let r = App::new("df")
+        .arg(Arg::from_usage("--opt [FILE] 'some arg'"))
+        .arg(Arg::from_usage("[arg] 'some arg'").default_value_if(
+            "opt",
+            None,
+            "default",
+        ))
+        .get_matches_from_safe(vec!["", "--opt", "some"]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("arg"));
+    assert_eq!(m.value_of("arg").unwrap(), "default");
+}
+
+#[test]
+fn default_if_arg_present_no_default_user_override() {
+    let r = App::new("df")
+        .arg(Arg::from_usage("--opt [FILE] 'some arg'"))
+        .arg(Arg::from_usage("[arg] 'some arg'").default_value_if(
+            "opt",
+            None,
+            "default",
+        ))
+        .get_matches_from_safe(vec!["", "--opt", "some", "other"]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("arg"));
+    assert_eq!(m.value_of("arg").unwrap(), "other");
+}
+
+#[test]
+fn default_if_arg_present_no_arg_with_default() {
+    let r = App::new("df")
+        .arg(Arg::from_usage("--opt [FILE] 'some arg'"))
+        .arg(
+            Arg::from_usage("[arg] 'some arg'")
+                .default_value("first")
+                .default_value_if("opt", None, "default"),
+        )
+        .get_matches_from_safe(vec![""]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("arg"));
+    assert_eq!(m.value_of("arg").unwrap(), "first");
+}
+
+#[test]
+fn default_if_arg_present_with_default() {
+    let r = App::new("df")
+        .arg(Arg::from_usage("--opt [FILE] 'some arg'"))
+        .arg(
+            Arg::from_usage("[arg] 'some arg'")
+                .default_value("first")
+                .default_value_if("opt", None, "default"),
+        )
+        .get_matches_from_safe(vec!["", "--opt", "some"]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("arg"));
+    assert_eq!(m.value_of("arg").unwrap(), "default");
+}
+
+#[test]
+fn default_if_arg_present_with_default_user_override() {
+    let r = App::new("df")
+        .arg(Arg::from_usage("--opt [FILE] 'some arg'"))
+        .arg(
+            Arg::from_usage("[arg] 'some arg'")
+                .default_value("first")
+                .default_value_if("opt", None, "default"),
+        )
+        .get_matches_from_safe(vec!["", "--opt", "some", "other"]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("arg"));
+    assert_eq!(m.value_of("arg").unwrap(), "other");
+}
+
+#[test]
+fn default_if_arg_present_no_arg_with_default_user_override() {
+    let r = App::new("df")
+        .arg(Arg::from_usage("--opt [FILE] 'some arg'"))
+        .arg(
+            Arg::from_usage("[arg] 'some arg'")
+                .default_value("first")
+                .default_value_if("opt", None, "default"),
+        )
+        .get_matches_from_safe(vec!["", "other"]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("arg"));
+    assert_eq!(m.value_of("arg").unwrap(), "other");
+}
+
+// Conditional Default Values
+
+#[test]
+fn default_if_arg_present_with_value_no_default() {
+    let r = App::new("df")
+        .arg(Arg::from_usage("--opt [FILE] 'some arg'"))
+        .arg(Arg::from_usage("[arg] 'some arg'").default_value_if(
+            "opt",
+            Some("value"),
+            "default",
+        ))
+        .get_matches_from_safe(vec!["", "--opt", "value"]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("arg"));
+    assert_eq!(m.value_of("arg").unwrap(), "default");
+}
+
+#[test]
+fn default_if_arg_present_with_value_no_default_fail() {
+    let r = App::new("df")
+        .arg(Arg::from_usage("--opt [FILE] 'some arg'"))
+        .arg(Arg::from_usage("[arg] 'some arg'").default_value_if(
+            "opt",
+            Some("value"),
+            "default",
+        ))
+        .get_matches_from_safe(vec!["", "--opt", "other"]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(!m.is_present("arg"));
+    //assert_eq!(m.value_of("arg").unwrap(), "default");
+}
+
+#[test]
+fn default_if_arg_present_with_value_no_default_user_override() {
+    let r = App::new("df")
+        .arg(Arg::from_usage("--opt [FILE] 'some arg'"))
+        .arg(Arg::from_usage("[arg] 'some arg'").default_value_if(
+            "opt",
+            Some("some"),
+            "default",
+        ))
+        .get_matches_from_safe(vec!["", "--opt", "some", "other"]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("arg"));
+    assert_eq!(m.value_of("arg").unwrap(), "other");
+}
+
+#[test]
+fn default_if_arg_present_with_value_no_arg_with_default() {
+    let r = App::new("df")
+        .arg(Arg::from_usage("--opt [FILE] 'some arg'"))
+        .arg(
+            Arg::from_usage("[arg] 'some arg'")
+                .default_value("first")
+                .default_value_if("opt", Some("some"), "default"),
+        )
+        .get_matches_from_safe(vec![""]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("arg"));
+    assert_eq!(m.value_of("arg").unwrap(), "first");
+}
+
+#[test]
+fn default_if_arg_present_with_value_no_arg_with_default_fail() {
+    let r = App::new("df")
+        .arg(Arg::from_usage("--opt [FILE] 'some arg'"))
+        .arg(
+            Arg::from_usage("[arg] 'some arg'")
+                .default_value("first")
+                .default_value_if("opt", Some("some"), "default"),
+        )
+        .get_matches_from_safe(vec!["", "--opt", "other"]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("arg"));
+    assert_eq!(m.value_of("arg").unwrap(), "first");
+}
+
+#[test]
+fn default_if_arg_present_with_value_with_default() {
+    let r = App::new("df")
+        .arg(Arg::from_usage("--opt [FILE] 'some arg'"))
+        .arg(
+            Arg::from_usage("[arg] 'some arg'")
+                .default_value("first")
+                .default_value_if("opt", Some("some"), "default"),
+        )
+        .get_matches_from_safe(vec!["", "--opt", "some"]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("arg"));
+    assert_eq!(m.value_of("arg").unwrap(), "default");
+}
+
+#[test]
+fn default_if_arg_present_with_value_with_default_user_override() {
+    let r = App::new("df")
+        .arg(Arg::from_usage("--opt [FILE] 'some arg'"))
+        .arg(
+            Arg::from_usage("[arg] 'some arg'")
+                .default_value("first")
+                .default_value_if("opt", Some("some"), "default"),
+        )
+        .get_matches_from_safe(vec!["", "--opt", "some", "other"]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("arg"));
+    assert_eq!(m.value_of("arg").unwrap(), "other");
+}
+
+#[test]
+fn default_if_arg_present_no_arg_with_value_with_default_user_override() {
+    let r = App::new("df")
+        .arg(Arg::from_usage("--opt [FILE] 'some arg'"))
+        .arg(
+            Arg::from_usage("[arg] 'some arg'")
+                .default_value("first")
+                .default_value_if("opt", Some("some"), "default"),
+        )
+        .get_matches_from_safe(vec!["", "other"]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("arg"));
+    assert_eq!(m.value_of("arg").unwrap(), "other");
+}
+
+#[test]
+fn default_if_arg_present_no_arg_with_value_with_default_user_override_fail() {
+    let r = App::new("df")
+        .arg(Arg::from_usage("--opt [FILE] 'some arg'"))
+        .arg(
+            Arg::from_usage("[arg] 'some arg'")
+                .default_value("first")
+                .default_value_if("opt", Some("some"), "default"),
+        )
+        .get_matches_from_safe(vec!["", "--opt", "value", "other"]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("arg"));
+    assert_eq!(m.value_of("arg").unwrap(), "other");
+}
+
+// Multiple conditions
+
+#[test]
+fn default_ifs_arg_present() {
+    let r = App::new("df")
+        .arg(Arg::from_usage("--opt [FILE] 'some arg'"))
+        .arg(Arg::from_usage("--flag 'some arg'"))
+        .arg(
+            Arg::from_usage("[arg] 'some arg'")
+                .default_value("first")
+                .default_value_ifs(&[("opt", Some("some"), "default"), ("flag", None, "flg")]),
+        )
+        .get_matches_from_safe(vec!["", "--flag"]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("arg"));
+    assert_eq!(m.value_of("arg").unwrap(), "flg");
+}
+
+#[test]
+fn default_ifs_arg_present_user_override() {
+    let r = App::new("df")
+        .arg(Arg::from_usage("--opt [FILE] 'some arg'"))
+        .arg(Arg::from_usage("--flag 'some arg'"))
+        .arg(
+            Arg::from_usage("[arg] 'some arg'")
+                .default_value("first")
+                .default_value_ifs(&[("opt", Some("some"), "default"), ("flag", None, "flg")]),
+        )
+        .get_matches_from_safe(vec!["", "--flag", "value"]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("arg"));
+    assert_eq!(m.value_of("arg").unwrap(), "value");
+}
+
+#[test]
+fn default_ifs_arg_present_order() {
+    let r = App::new("df")
+        .arg(Arg::from_usage("--opt [FILE] 'some arg'"))
+        .arg(Arg::from_usage("--flag 'some arg'"))
+        .arg(
+            Arg::from_usage("[arg] 'some arg'")
+                .default_value("first")
+                .default_value_ifs(&[("opt", Some("some"), "default"), ("flag", None, "flg")]),
+        )
+        .get_matches_from_safe(vec!["", "--opt=some", "--flag"]);
+    assert!(r.is_ok());
+    let m = r.unwrap();
+    assert!(m.is_present("arg"));
+    assert_eq!(m.value_of("arg").unwrap(), "default");
+}
+
+#[test]
+fn conditional_reqs_fail() {
+    let m = App::new("Test app")
+        .version("1.0")
+        .author("F0x06")
+        .about("Arg test")
+        .arg(
+            Arg::with_name("target")
+                .takes_value(true)
+                .default_value("file")
+                .possible_values(&["file", "stdout"])
+                .long("target"),
+        )
+        .arg(
+            Arg::with_name("input")
+                .takes_value(true)
+                .required(true)
+                .long("input"),
+        )
+        .arg(
+            Arg::with_name("output")
+                .takes_value(true)
+                .required_if("target", "file")
+                .long("output"),
+        )
+        .get_matches_from_safe(vec!["test", "--input", "some"]);
+
+    assert!(m.is_err());
+    assert_eq!(m.unwrap_err().kind, ErrorKind::MissingRequiredArgument);
+}
+
+#[test]
+fn conditional_reqs_pass() {
+    let m = App::new("Test app")
+        .version("1.0")
+        .author("F0x06")
+        .about("Arg test")
+        .arg(
+            Arg::with_name("target")
+                .takes_value(true)
+                .default_value("file")
+                .possible_values(&["file", "stdout"])
+                .long("target"),
+        )
+        .arg(
+            Arg::with_name("input")
+                .takes_value(true)
+                .required(true)
+                .long("input"),
+        )
+        .arg(
+            Arg::with_name("output")
+                .takes_value(true)
+                .required_if("target", "file")
+                .long("output"),
+        )
+        .get_matches_from_safe(vec!["test", "--input", "some", "--output", "other"]);
+
+    assert!(m.is_ok());
+    let m = m.unwrap();
+    assert_eq!(m.value_of("output"), Some("other"));
+    assert_eq!(m.value_of("input"), Some("some"));
+}
+
+#[test]
+fn issue_1050_num_vals_and_defaults() {
+    let res = App::new("hello")
+        .arg(
+            Arg::with_name("exit-code")
+                .long("exit-code")
+                .required(true)
+                .takes_value(true)
+                .number_of_values(1)
+                .default_value("0"),
+        )
+        .get_matches_from_safe(vec!["hello", "--exit-code=1"]);
+    assert!(res.is_ok());
+    let m = res.unwrap();
+    assert_eq!(m.value_of("exit-code"), Some("1"));
+}