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, 292 insertions, 0 deletions

diff --git a/clap/tests/posix_compatible.rs b/clap/tests/posix_compatible.rs
new file mode 100644
index 0000000..26d9f71
--- /dev/null
+++ b/clap/tests/posix_compatible.rs
@@ -0,0 +1,292 @@
+extern crate clap;
+
+use clap::{App, Arg, ErrorKind};
+
+#[test]
+fn flag_overrides_itself() {
+    let res = App::new("posix")
+                .arg(Arg::from_usage("--flag  'some flag'").overrides_with("flag"))
+                .get_matches_from_safe(vec!["", "--flag", "--flag"]);
+    assert!(res.is_ok());
+    let m = res.unwrap();
+    assert!(m.is_present("flag"));
+    assert_eq!(m.occurrences_of("flag"), 1);
+}
+
+#[test]
+fn mult_flag_overrides_itself() {
+    let res = App::new("posix")
+                .arg(Arg::from_usage("--flag...  'some flag'").overrides_with("flag"))
+                .get_matches_from_safe(vec!["", "--flag", "--flag", "--flag", "--flag"]);
+    assert!(res.is_ok());
+    let m = res.unwrap();
+    assert!(m.is_present("flag"));
+    assert_eq!(m.occurrences_of("flag"), 4);
+}
+
+#[test]
+fn option_overrides_itself() {
+    let res = App::new("posix")
+                .arg(Arg::from_usage("--opt [val] 'some option'").overrides_with("opt"))
+                .get_matches_from_safe(vec!["", "--opt=some", "--opt=other"]);
+    assert!(res.is_ok());
+    let m = res.unwrap();
+    assert!(m.is_present("opt"));
+    assert_eq!(m.occurrences_of("opt"), 1);
+    assert_eq!(m.value_of("opt"), Some("other"));
+}
+
+#[test]
+fn mult_option_require_delim_overrides_itself() {
+    let res = App::new("posix")
+                .arg(Arg::from_usage("--opt [val]... 'some option'")
+                    .overrides_with("opt")
+                    .number_of_values(1)
+                    .require_delimiter(true))
+                .get_matches_from_safe(vec!["", "--opt=some", "--opt=other", "--opt=one,two"]);
+    assert!(res.is_ok());
+    let m = res.unwrap();
+    assert!(m.is_present("opt"));
+    assert_eq!(m.occurrences_of("opt"), 3);
+    assert_eq!(m.values_of("opt").unwrap().collect::<Vec<_>>(), &["some", "other", "one", "two"]);
+}
+
+#[test]
+fn mult_option_overrides_itself() {
+    let res = App::new("posix")
+                .arg(Arg::from_usage("--opt [val]... 'some option'")
+                    .overrides_with("opt"))
+                .get_matches_from_safe(vec!["", "--opt", "first", "overides", "--opt", "some", "other", "val"]);
+    assert!(res.is_ok());
+    let m = res.unwrap();
+    assert!(m.is_present("opt"));
+    assert_eq!(m.occurrences_of("opt"), 2);
+    assert_eq!(m.values_of("opt").unwrap().collect::<Vec<_>>(), &["first", "overides", "some", "other", "val"]);
+}
+
+#[test]
+fn option_use_delim_false_override_itself() {
+
+    let m = App::new("posix")
+                .arg(Arg::from_usage("--opt [val] 'some option'")
+                    .overrides_with("opt")
+                    .use_delimiter(false))
+                .get_matches_from(vec!["", "--opt=some,other", "--opt=one,two"]);
+    assert!(m.is_present("opt"));
+    assert_eq!(m.occurrences_of("opt"), 1);
+    assert_eq!(m.values_of("opt").unwrap().collect::<Vec<_>>(), &["one,two"]);
+}
+
+#[test]
+fn pos_mult_overrides_itself() {
+    // opts with multiple
+    let res = App::new("posix")
+                .arg(Arg::from_usage("[val]... 'some pos'").overrides_with("val"))
+                .get_matches_from_safe(vec!["", "some", "other", "value"]);
+    assert!(res.is_ok());
+    let m = res.unwrap();
+    assert!(m.is_present("val"));
+    assert_eq!(m.occurrences_of("val"), 3);
+    assert_eq!(m.values_of("val").unwrap().collect::<Vec<_>>(), &["some", "other", "value"]);
+}
+
+#[test]
+fn posix_compatible_flags_long() {
+    let m = App::new("posix")
+                .arg(Arg::from_usage("--flag  'some flag'").overrides_with("color"))
+                .arg(Arg::from_usage("--color 'some other flag'"))
+                .get_matches_from(vec!["", "--flag", "--color"]);
+    assert!(m.is_present("color"));
+    assert!(!m.is_present("flag"));
+
+    let m = App::new("posix")
+                .arg(Arg::from_usage("--flag  'some flag'").overrides_with("color"))
+                .arg(Arg::from_usage("--color 'some other flag'"))
+                .get_matches_from(vec!["", "--color", "--flag"]);
+    assert!(!m.is_present("color"));
+    assert!(m.is_present("flag"));
+}
+
+#[test]
+fn posix_compatible_flags_short() {
+    let m = App::new("posix")
+                .arg(Arg::from_usage("-f, --flag  'some flag'").overrides_with("color"))
+                .arg(Arg::from_usage("-c, --color 'some other flag'"))
+                .get_matches_from(vec!["", "-f", "-c"]);
+    assert!(m.is_present("color"));
+    assert!(!m.is_present("flag"));
+
+    let m = App::new("posix")
+                .arg(Arg::from_usage("-f, --flag  'some flag'").overrides_with("color"))
+                .arg(Arg::from_usage("-c, --color 'some other flag'"))
+                .get_matches_from(vec!["", "-c", "-f"]);
+    assert!(!m.is_present("color"));
+    assert!(m.is_present("flag"));
+}
+
+#[test]
+fn posix_compatible_opts_long() {
+    let m = App::new("posix")
+                .arg(Arg::from_usage("--flag [flag] 'some flag'").overrides_with("color"))
+                .arg(Arg::from_usage("--color [color] 'some other flag'"))
+                .get_matches_from(vec!["", "--flag", "some" ,"--color", "other"]);
+    assert!(m.is_present("color"));
+    assert_eq!(m.value_of("color").unwrap(), "other");
+    assert!(!m.is_present("flag"));
+
+    let m = App::new("posix")
+                .arg(Arg::from_usage("--flag [flag] 'some flag'").overrides_with("color"))
+                .arg(Arg::from_usage("--color [color] 'some other flag'"))
+                .get_matches_from(vec!["", "--color", "some" ,"--flag", "other"]);
+    assert!(!m.is_present("color"));
+    assert!(m.is_present("flag"));
+    assert_eq!(m.value_of("flag").unwrap(), "other");
+}
+
+#[test]
+fn posix_compatible_opts_long_equals() {
+    let m = App::new("posix")
+                .arg(Arg::from_usage("--flag [flag] 'some flag'").overrides_with("color"))
+                .arg(Arg::from_usage("--color [color] 'some other flag'"))
+                .get_matches_from(vec!["", "--flag=some" ,"--color=other"]);
+    assert!(m.is_present("color"));
+    assert_eq!(m.value_of("color").unwrap(), "other");
+    assert!(!m.is_present("flag"));
+
+    let m = App::new("posix")
+                .arg(Arg::from_usage("--flag [flag] 'some flag'").overrides_with("color"))
+                .arg(Arg::from_usage("--color [color] 'some other flag'"))
+                .get_matches_from(vec!["", "--color=some" ,"--flag=other"]);
+    assert!(!m.is_present("color"));
+    assert!(m.is_present("flag"));
+    assert_eq!(m.value_of("flag").unwrap(), "other");
+}
+
+#[test]
+fn posix_compatible_opts_short() {
+    let m = App::new("posix")
+                .arg(Arg::from_usage("-f [flag]  'some flag'").overrides_with("c"))
+                .arg(Arg::from_usage("-c [color] 'some other flag'"))
+                .get_matches_from(vec!["", "-f", "some", "-c", "other"]);
+    assert!(m.is_present("c"));
+    assert_eq!(m.value_of("c").unwrap(), "other");
+    assert!(!m.is_present("f"));
+
+    let m = App::new("posix")
+                .arg(Arg::from_usage("-f [flag]  'some flag'").overrides_with("c"))
+                .arg(Arg::from_usage("-c [color] 'some other flag'"))
+                .get_matches_from(vec!["", "-c", "some", "-f", "other"]);
+    assert!(!m.is_present("c"));
+    assert!(m.is_present("f"));
+    assert_eq!(m.value_of("f").unwrap(), "other");
+}
+
+#[test]
+fn conflict_overriden() {
+    let m = App::new("conflict_overriden")
+        .arg(Arg::from_usage("-f, --flag 'some flag'")
+            .conflicts_with("debug"))
+        .arg(Arg::from_usage("-d, --debug 'other flag'"))
+        .arg(Arg::from_usage("-c, --color 'third flag'")
+            .overrides_with("flag"))
+        .get_matches_from(vec!["", "-f", "-c", "-d"]);
+    assert!(m.is_present("color"));
+    assert!(!m.is_present("flag"));
+    assert!(m.is_present("debug"));
+}
+
+#[test]
+fn conflict_overriden_2() {
+    let result = App::new("conflict_overriden")
+        .arg(Arg::from_usage("-f, --flag 'some flag'")
+            .conflicts_with("debug"))
+        .arg(Arg::from_usage("-d, --debug 'other flag'"))
+        .arg(Arg::from_usage("-c, --color 'third flag'")
+            .overrides_with("flag"))
+        .get_matches_from_safe(vec!["", "-f", "-d", "-c"]);
+    assert!(result.is_ok());
+    let m = result.unwrap();
+    assert!(m.is_present("color"));
+    assert!(m.is_present("debug"));
+    assert!(!m.is_present("flag"));
+}
+
+#[test]
+fn conflict_overriden_3() {
+    let result = App::new("conflict_overriden")
+        .arg(Arg::from_usage("-f, --flag 'some flag'")
+            .conflicts_with("debug"))
+        .arg(Arg::from_usage("-d, --debug 'other flag'"))
+        .arg(Arg::from_usage("-c, --color 'third flag'")
+            .overrides_with("flag"))
+        .get_matches_from_safe(vec!["", "-d", "-c", "-f"]);
+    assert!(result.is_err());
+    let err = result.err().unwrap();
+    assert_eq!(err.kind, ErrorKind::ArgumentConflict);
+}
+
+#[test]
+fn conflict_overriden_4() {
+    let m = App::new("conflict_overriden")
+        .arg(Arg::from_usage("-f, --flag 'some flag'")
+            .conflicts_with("debug"))
+        .arg(Arg::from_usage("-d, --debug 'other flag'"))
+        .arg(Arg::from_usage("-c, --color 'third flag'")
+            .overrides_with("flag"))
+        .get_matches_from(vec!["", "-d", "-f", "-c"]);
+    assert!(m.is_present("color"));
+    assert!(!m.is_present("flag"));
+    assert!(m.is_present("debug"));
+}
+
+#[test]
+fn pos_required_overridden_by_flag() {
+    let result = App::new("require_overriden")
+        .arg(Arg::with_name("pos")
+            .index(1)
+            .required(true))
+        .arg(Arg::from_usage("-c, --color 'some flag'")
+            .overrides_with("pos"))
+        .get_matches_from_safe(vec!["", "test", "-c"]);
+    assert!(result.is_ok(), "{:?}", result.unwrap_err());
+}
+
+#[test]
+fn require_overriden_2() {
+    let m = App::new("require_overriden")
+        .arg(Arg::with_name("req_pos")
+            .required(true))
+        .arg(Arg::from_usage("-c, --color 'other flag'")
+            .overrides_with("req_pos"))
+        .get_matches_from(vec!["", "-c", "req_pos"]);
+    assert!(!m.is_present("color"));
+    assert!(m.is_present("req_pos"));
+}
+
+#[test]
+fn require_overriden_3() {
+    let m = App::new("require_overriden")
+        .arg(Arg::from_usage("-f, --flag 'some flag'")
+            .requires("debug"))
+        .arg(Arg::from_usage("-d, --debug 'other flag'"))
+        .arg(Arg::from_usage("-c, --color 'third flag'")
+            .overrides_with("flag"))
+        .get_matches_from(vec!["", "-f", "-c"]);
+    assert!(m.is_present("color"));
+    assert!(!m.is_present("flag"));
+    assert!(!m.is_present("debug"));
+}
+
+#[test]
+fn require_overriden_4() {
+    let result = App::new("require_overriden")
+        .arg(Arg::from_usage("-f, --flag 'some flag'")
+            .requires("debug"))
+        .arg(Arg::from_usage("-d, --debug 'other flag'"))
+        .arg(Arg::from_usage("-c, --color 'third flag'")
+            .overrides_with("flag"))
+        .get_matches_from_safe(vec!["", "-c", "-f"]);
+    assert!(result.is_err());
+    let err = result.err().unwrap();
+    assert_eq!(err.kind, ErrorKind::MissingRequiredArgument);
+}