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

diff --git a/clap/tests/indices.rs b/clap/tests/indices.rs
new file mode 100644
index 0000000..910529e
--- /dev/null
+++ b/clap/tests/indices.rs
@@ -0,0 +1,175 @@
+extern crate clap;
+extern crate regex;
+
+include!("../clap-test.rs");
+
+use clap::{App, Arg};
+
+#[test]
+fn indices_mult_opts() {
+	let m = App::new("ind")
+		.arg(Arg::with_name("exclude")
+			.short("e")
+			.takes_value(true)
+			.multiple(true))
+		.arg(Arg::with_name("include")
+			.short("i")
+			.takes_value(true)
+			.multiple(true))
+		.get_matches_from(vec!["ind", "-e", "A", "B", "-i", "B", "C", "-e", "C"]);
+
+		assert_eq!(m.indices_of("exclude").unwrap().collect::<Vec<_>>(), &[2, 3, 8]);
+		assert_eq!(m.indices_of("include").unwrap().collect::<Vec<_>>(), &[5, 6]);
+}
+
+#[test]
+fn index_mult_opts() {
+	let m = App::new("ind")
+		.arg(Arg::with_name("exclude")
+			.short("e")
+			.takes_value(true)
+			.multiple(true))
+		.arg(Arg::with_name("include")
+			.short("i")
+			.takes_value(true)
+			.multiple(true))
+		.get_matches_from(vec!["ind", "-e", "A", "B", "-i", "B", "C", "-e", "C"]);
+
+		assert_eq!(m.index_of("exclude"), Some(2));
+		assert_eq!(m.index_of("include"), Some(5));
+}
+
+#[test]
+fn index_flag() {
+	let m = App::new("ind")
+		.arg(Arg::with_name("exclude")
+			.short("e"))
+		.arg(Arg::with_name("include")
+			.short("i"))
+		.get_matches_from(vec!["ind", "-e", "-i"]);
+
+		assert_eq!(m.index_of("exclude"), Some(1));
+		assert_eq!(m.index_of("include"), Some(2));
+}
+
+#[test]
+fn index_flags() {
+	let m = App::new("ind")
+		.arg(Arg::with_name("exclude")
+			.short("e")
+			.multiple(true))
+		.arg(Arg::with_name("include")
+			.short("i")
+			.multiple(true))
+		.get_matches_from(vec!["ind", "-e", "-i", "-e", "-e", "-i"]);
+
+		assert_eq!(m.index_of("exclude"), Some(1));
+		assert_eq!(m.index_of("include"), Some(2));
+}
+
+#[test]
+fn indices_mult_flags() {
+	let m = App::new("ind")
+		.arg(Arg::with_name("exclude")
+			.short("e")
+			.multiple(true))
+		.arg(Arg::with_name("include")
+			.short("i")
+			.multiple(true))
+		.get_matches_from(vec!["ind", "-e", "-i", "-e", "-e", "-i"]);
+
+		assert_eq!(m.indices_of("exclude").unwrap().collect::<Vec<_>>(), &[1, 3, 4]);
+		assert_eq!(m.indices_of("include").unwrap().collect::<Vec<_>>(), &[2, 5]);
+}
+
+#[test]
+fn indices_mult_flags_combined() {
+	let m = App::new("ind")
+		.arg(Arg::with_name("exclude")
+			.short("e")
+			.multiple(true))
+		.arg(Arg::with_name("include")
+			.short("i")
+			.multiple(true))
+		.get_matches_from(vec!["ind", "-eieei"]);
+
+		assert_eq!(m.indices_of("exclude").unwrap().collect::<Vec<_>>(), &[1, 3, 4]);
+		assert_eq!(m.indices_of("include").unwrap().collect::<Vec<_>>(), &[2, 5]);
+}
+
+#[test]
+fn indices_mult_flags_opt_combined() {
+	let m = App::new("ind")
+		.arg(Arg::with_name("exclude")
+			.short("e")
+			.multiple(true))
+		.arg(Arg::with_name("include")
+			.short("i")
+			.multiple(true))
+		.arg(Arg::with_name("option")
+			.short("o")
+			.takes_value(true))
+		.get_matches_from(vec!["ind", "-eieeio", "val"]);
+
+		assert_eq!(m.indices_of("exclude").unwrap().collect::<Vec<_>>(), &[1, 3, 4]);
+		assert_eq!(m.indices_of("include").unwrap().collect::<Vec<_>>(), &[2, 5]);
+		assert_eq!(m.indices_of("option").unwrap().collect::<Vec<_>>(), &[7]);
+}
+
+#[test]
+fn indices_mult_flags_opt_combined_eq() {
+	let m = App::new("ind")
+		.arg(Arg::with_name("exclude")
+			.short("e")
+			.multiple(true))
+		.arg(Arg::with_name("include")
+			.short("i")
+			.multiple(true))
+		.arg(Arg::with_name("option")
+			.short("o")
+			.takes_value(true))
+		.get_matches_from(vec!["ind", "-eieeio=val"]);
+
+		assert_eq!(m.indices_of("exclude").unwrap().collect::<Vec<_>>(), &[1, 3, 4]);
+		assert_eq!(m.indices_of("include").unwrap().collect::<Vec<_>>(), &[2, 5]);
+		assert_eq!(m.indices_of("option").unwrap().collect::<Vec<_>>(), &[7]);
+}
+
+#[test]
+fn indices_mult_opt_value_delim_eq() {
+    let m = App::new("myapp")
+	    .arg(Arg::with_name("option")
+		    .short("o")
+		    .takes_value(true)
+		    .use_delimiter(true)
+		    .multiple(true))
+	    .get_matches_from(vec!["myapp", "-o=val1,val2,val3"]);
+    assert_eq!(m.indices_of("option").unwrap().collect::<Vec<_>>(), &[2, 3, 4]);
+}
+
+#[test]
+fn indices_mult_opt_value_no_delim_eq() {
+    let m = App::new("myapp")
+	    .arg(Arg::with_name("option")
+		    .short("o")
+		    .takes_value(true)
+		    .multiple(true))
+	    .get_matches_from(vec!["myapp", "-o=val1,val2,val3"]);
+    assert_eq!(m.indices_of("option").unwrap().collect::<Vec<_>>(), &[2]);
+}
+
+#[test]
+fn indices_mult_opt_mult_flag() {
+    let m = App::new("myapp")
+    .arg(Arg::with_name("option")
+	    .short("o")
+	    .takes_value(true)
+	    .multiple(true))
+    .arg(Arg::with_name("flag")
+	    .short("f")
+	    .multiple(true))
+    .get_matches_from(vec!["myapp", "-o", "val1", "-f", "-o", "val2", "-f"]);
+
+    assert_eq!(m.indices_of("option").unwrap().collect::<Vec<_>>(), &[2, 5]);
+    assert_eq!(m.indices_of("flag").unwrap().collect::<Vec<_>>(), &[3, 6]);
+}