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

diff --git a/clap/tests/derive_order.rs b/clap/tests/derive_order.rs
new file mode 100644
index 0000000..b30c8ad
--- /dev/null
+++ b/clap/tests/derive_order.rs
@@ -0,0 +1,245 @@
+extern crate clap;
+extern crate regex;
+
+use std::str;
+
+use clap::{App, Arg, SubCommand, AppSettings};
+
+include!("../clap-test.rs");
+
+static NO_DERIVE_ORDER: &'static str = "test 1.2
+
+USAGE:
+    test [FLAGS] [OPTIONS]
+
+FLAGS:
+        --flag_a     second flag
+        --flag_b     first flag
+    -h, --help       Prints help information
+    -V, --version    Prints version information
+
+OPTIONS:
+        --option_a <option_a>    second option
+        --option_b <option_b>    first option";
+
+static DERIVE_ORDER: &'static str = "test 1.2
+
+USAGE:
+    test [FLAGS] [OPTIONS]
+
+FLAGS:
+        --flag_b     first flag
+        --flag_a     second flag
+    -h, --help       Prints help information
+    -V, --version    Prints version information
+
+OPTIONS:
+        --option_b <option_b>    first option
+        --option_a <option_a>    second option";
+
+static UNIFIED_HELP: &'static str = "test 1.2
+
+USAGE:
+    test [OPTIONS]
+
+OPTIONS:
+        --flag_a                 second flag
+        --flag_b                 first flag
+    -h, --help                   Prints help information
+        --option_a <option_a>    second option
+        --option_b <option_b>    first option
+    -V, --version                Prints version information";
+
+static UNIFIED_HELP_AND_DERIVE: &'static str = "test 1.2
+
+USAGE:
+    test [OPTIONS]
+
+OPTIONS:
+        --flag_b                 first flag
+        --option_b <option_b>    first option
+        --flag_a                 second flag
+        --option_a <option_a>    second option
+    -h, --help                   Prints help information
+    -V, --version                Prints version information";
+
+static DERIVE_ORDER_SC_PROP: &'static str = "test-sub 1.2
+
+USAGE:
+    test sub [FLAGS] [OPTIONS]
+
+FLAGS:
+        --flag_b     first flag
+        --flag_a     second flag
+    -h, --help       Prints help information
+    -V, --version    Prints version information
+
+OPTIONS:
+        --option_b <option_b>    first option
+        --option_a <option_a>    second option";
+
+static UNIFIED_SC_PROP: &'static str = "test-sub 1.2
+
+USAGE:
+    test sub [OPTIONS]
+
+OPTIONS:
+        --flag_a                 second flag
+        --flag_b                 first flag
+    -h, --help                   Prints help information
+        --option_a <option_a>    second option
+        --option_b <option_b>    first option
+    -V, --version                Prints version information";
+
+static UNIFIED_DERIVE_SC_PROP: &'static str = "test-sub 1.2
+
+USAGE:
+    test sub [OPTIONS]
+
+OPTIONS:
+        --flag_b                 first flag
+        --option_b <option_b>    first option
+        --flag_a                 second flag
+        --option_a <option_a>    second option
+    -h, --help                   Prints help information
+    -V, --version                Prints version information";
+
+static UNIFIED_DERIVE_SC_PROP_EXPLICIT_ORDER: &'static str = "test-sub 1.2
+
+USAGE:
+    test sub [OPTIONS]
+
+OPTIONS:
+        --flag_a                 second flag
+        --flag_b                 first flag
+        --option_b <option_b>    first option
+        --option_a <option_a>    second option
+    -h, --help                   Prints help information
+    -V, --version                Prints version information";
+
+#[test]
+fn no_derive_order() {
+    let app = App::new("test")
+        .version("1.2")
+        .args(&[
+            Arg::with_name("flag_b").long("flag_b").help("first flag"),
+            Arg::with_name("option_b").long("option_b").takes_value(true).help("first option"),
+            Arg::with_name("flag_a").long("flag_a").help("second flag"),
+            Arg::with_name("option_a").long("option_a").takes_value(true).help("second option"),
+        ]);
+
+    assert!(test::compare_output(app, "test --help", NO_DERIVE_ORDER, false));
+}
+
+#[test]
+fn derive_order() {
+    let app = App::new("test")
+        .setting(AppSettings::DeriveDisplayOrder)
+        .version("1.2")
+        .args(&[
+            Arg::with_name("flag_b").long("flag_b").help("first flag"),
+            Arg::with_name("option_b").long("option_b").takes_value(true).help("first option"),
+            Arg::with_name("flag_a").long("flag_a").help("second flag"),
+            Arg::with_name("option_a").long("option_a").takes_value(true).help("second option"),
+        ]);
+
+    assert!(test::compare_output(app, "test --help", DERIVE_ORDER, false));
+}
+
+#[test]
+fn unified_help() {
+    let app = App::new("test")
+        .setting(AppSettings::UnifiedHelpMessage)
+        .version("1.2")
+        .args(&[
+            Arg::with_name("flag_b").long("flag_b").help("first flag"),
+            Arg::with_name("option_b").long("option_b").takes_value(true).help("first option"),
+            Arg::with_name("flag_a").long("flag_a").help("second flag"),
+            Arg::with_name("option_a").long("option_a").takes_value(true).help("second option"),
+        ]);
+
+    assert!(test::compare_output(app, "test --help", UNIFIED_HELP, false));
+}
+
+#[test]
+fn unified_help_and_derive_order() {
+    let app = App::new("test")
+        .setting(AppSettings::DeriveDisplayOrder)
+        .setting(AppSettings::UnifiedHelpMessage)
+        .version("1.2")
+        .args(&[
+            Arg::with_name("flag_b").long("flag_b").help("first flag"),
+            Arg::with_name("option_b").long("option_b").takes_value(true).help("first option"),
+            Arg::with_name("flag_a").long("flag_a").help("second flag"),
+            Arg::with_name("option_a").long("option_a").takes_value(true).help("second option"),
+        ]);
+
+    assert!(test::compare_output(app, "test --help", UNIFIED_HELP_AND_DERIVE, false));
+}
+
+#[test]
+fn derive_order_subcommand_propagate() {
+    let app = App::new("test")
+        .global_setting(AppSettings::DeriveDisplayOrder)
+        .version("1.2")
+        .subcommand(SubCommand::with_name("sub")
+            .version("1.2")
+            .args(&[
+                Arg::with_name("flag_b").long("flag_b").help("first flag"),
+                Arg::with_name("option_b").long("option_b").takes_value(true).help("first option"),
+                Arg::with_name("flag_a").long("flag_a").help("second flag"),
+                Arg::with_name("option_a").long("option_a").takes_value(true).help("second option"),
+            ]));
+
+    assert!(test::compare_output(app, "test sub --help", DERIVE_ORDER_SC_PROP, false));
+}
+
+#[test]
+fn unified_help_subcommand_propagate() {
+    let app = App::new("test")
+        .global_setting(AppSettings::UnifiedHelpMessage)
+        .subcommand(SubCommand::with_name("sub")
+            .version("1.2")
+            .args(&[
+                Arg::with_name("flag_b").long("flag_b").help("first flag"),
+                Arg::with_name("option_b").long("option_b").takes_value(true).help("first option"),
+                Arg::with_name("flag_a").long("flag_a").help("second flag"),
+                Arg::with_name("option_a").long("option_a").takes_value(true).help("second option"),
+            ]));
+
+    assert!(test::compare_output(app, "test sub --help", UNIFIED_SC_PROP, false));
+}
+
+#[test]
+fn unified_help_and_derive_order_subcommand_propagate() {
+    let app = App::new("test")
+        .global_setting(AppSettings::DeriveDisplayOrder)
+        .global_setting(AppSettings::UnifiedHelpMessage)
+        .subcommand(SubCommand::with_name("sub")
+            .version("1.2")
+            .args(&[
+                Arg::with_name("flag_b").long("flag_b").help("first flag"),
+                Arg::with_name("option_b").long("option_b").takes_value(true).help("first option"),
+                Arg::with_name("flag_a").long("flag_a").help("second flag"),
+                Arg::with_name("option_a").long("option_a").takes_value(true).help("second option"),
+            ]));
+
+    assert!(test::compare_output(app, "test sub --help", UNIFIED_DERIVE_SC_PROP, false));
+}
+
+#[test]
+fn unified_help_and_derive_order_subcommand_propagate_with_explicit_display_order() {
+    let app = App::new("test")
+        .global_setting(AppSettings::DeriveDisplayOrder)
+        .global_setting(AppSettings::UnifiedHelpMessage)
+        .subcommand(SubCommand::with_name("sub")
+            .version("1.2")
+            .args(&[
+                Arg::with_name("flag_b").long("flag_b").help("first flag"),
+                Arg::with_name("option_b").long("option_b").takes_value(true).help("first option"),
+                Arg::with_name("flag_a").long("flag_a").help("second flag").display_order(0),
+                Arg::with_name("option_a").long("option_a").takes_value(true).help("second option"),
+            ]));
+
+    assert!(test::compare_output(app, "test sub --help", UNIFIED_DERIVE_SC_PROP_EXPLICIT_ORDER, false));
+}