Upgrade rust/crates/structopt to 0.3.21 am: 1fc28252fb am: 948743e098 am: a9f136f0f5

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt/+/1514955

Change-Id: I6f33ce9bd501decee9629fc722496beab6de418a

66 files changed, 7 insertions, 9 deletions

diff --git a/tests/ui/bool_default_value.rs b/tests/ui/bool_default_value.rs
index 9bdb0c9..9bdb0c9 100755..100644
--- a/tests/ui/bool_default_value.rs
+++ b/tests/ui/bool_default_value.rs
diff --git a/tests/ui/bool_default_value.stderr b/tests/ui/bool_default_value.stderr
index 1e26a2d..1e26a2d 100755..100644
--- a/tests/ui/bool_default_value.stderr
+++ b/tests/ui/bool_default_value.stderr
diff --git a/tests/ui/bool_required.rs b/tests/ui/bool_required.rs
index 018223c..018223c 100755..100644
--- a/tests/ui/bool_required.rs
+++ b/tests/ui/bool_required.rs
diff --git a/tests/ui/bool_required.stderr b/tests/ui/bool_required.stderr
index 0b80d48..0b80d48 100755..100644
--- a/tests/ui/bool_required.stderr
+++ b/tests/ui/bool_required.stderr
diff --git a/tests/ui/enum_flatten.rs b/tests/ui/enum_flatten.rs
index 768de76..768de76 100755..100644
--- a/tests/ui/enum_flatten.rs
+++ b/tests/ui/enum_flatten.rs
diff --git a/tests/ui/enum_flatten.stderr b/tests/ui/enum_flatten.stderr
index d74fa85..d74fa85 100755..100644
--- a/tests/ui/enum_flatten.stderr
+++ b/tests/ui/enum_flatten.stderr
diff --git a/tests/ui/external_subcommand_wrong_type.rs b/tests/ui/external_subcommand_wrong_type.rs
index ad62e73..ad62e73 100755..100644
--- a/tests/ui/external_subcommand_wrong_type.rs
+++ b/tests/ui/external_subcommand_wrong_type.rs
diff --git a/tests/ui/external_subcommand_wrong_type.stderr b/tests/ui/external_subcommand_wrong_type.stderr
index 1966225..73f12d2 100755..100644
--- a/tests/ui/external_subcommand_wrong_type.stderr
+++ b/tests/ui/external_subcommand_wrong_type.stderr
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
   --> $DIR/external_subcommand_wrong_type.rs:13:15
    |
 13 |     Other(Vec<CString>)
-   |               ^^^^^^^ expected struct `std::ffi::CString`, found struct `std::ffi::OsString`
+   |               ^^^^^^^ expected struct `CString`, found struct `OsString`
    |
-   = note: expected struct `std::vec::Vec<std::ffi::CString>`
-              found struct `std::vec::Vec<std::ffi::OsString>`
+   = note: expected struct `Vec<CString>`
+              found struct `Vec<OsString>`
diff --git a/tests/ui/flatten_and_methods.rs b/tests/ui/flatten_and_methods.rs
index ff1af2e..ff1af2e 100755..100644
--- a/tests/ui/flatten_and_methods.rs
+++ b/tests/ui/flatten_and_methods.rs
diff --git a/tests/ui/flatten_and_methods.stderr b/tests/ui/flatten_and_methods.stderr
index 77d97ae..77d97ae 100755..100644
--- a/tests/ui/flatten_and_methods.stderr
+++ b/tests/ui/flatten_and_methods.stderr
diff --git a/tests/ui/flatten_and_parse.rs b/tests/ui/flatten_and_parse.rs
index 3317272..3317272 100755..100644
--- a/tests/ui/flatten_and_parse.rs
+++ b/tests/ui/flatten_and_parse.rs
diff --git a/tests/ui/flatten_and_parse.stderr b/tests/ui/flatten_and_parse.stderr
index e217a84..e217a84 100755..100644
--- a/tests/ui/flatten_and_parse.stderr
+++ b/tests/ui/flatten_and_parse.stderr
diff --git a/tests/ui/multiple_external_subcommand.rs b/tests/ui/multiple_external_subcommand.rs
index 986261b..986261b 100755..100644
--- a/tests/ui/multiple_external_subcommand.rs
+++ b/tests/ui/multiple_external_subcommand.rs
diff --git a/tests/ui/multiple_external_subcommand.stderr b/tests/ui/multiple_external_subcommand.stderr
index 0c80c2e..0c80c2e 100755..100644
--- a/tests/ui/multiple_external_subcommand.stderr
+++ b/tests/ui/multiple_external_subcommand.stderr
diff --git a/tests/ui/non_existent_attr.rs b/tests/ui/non_existent_attr.rs
index 96daf45..96daf45 100755..100644
--- a/tests/ui/non_existent_attr.rs
+++ b/tests/ui/non_existent_attr.rs
diff --git a/tests/ui/non_existent_attr.stderr b/tests/ui/non_existent_attr.stderr
index e5edb56..61f784e 100755..100644
--- a/tests/ui/non_existent_attr.stderr
+++ b/tests/ui/non_existent_attr.stderr
@@ -1,5 +1,5 @@
-error[E0599]: no method named `non_existing_attribute` found for struct `structopt::clap::Arg<'_, '_>` in the current scope
+error[E0599]: no method named `non_existing_attribute` found for struct `Arg<'_, '_>` in the current scope
   --> $DIR/non_existent_attr.rs:14:24
    |
 14 |     #[structopt(short, non_existing_attribute = 1)]
-   |                        ^^^^^^^^^^^^^^^^^^^^^^ method not found in `structopt::clap::Arg<'_, '_>`
+   |                        ^^^^^^^^^^^^^^^^^^^^^^ method not found in `Arg<'_, '_>`
diff --git a/tests/ui/opt_opt_nonpositional.rs b/tests/ui/opt_opt_nonpositional.rs
index 2a08105..2a08105 100755..100644
--- a/tests/ui/opt_opt_nonpositional.rs
+++ b/tests/ui/opt_opt_nonpositional.rs
diff --git a/tests/ui/opt_opt_nonpositional.stderr b/tests/ui/opt_opt_nonpositional.stderr
index cb9f172..cb9f172 100755..100644
--- a/tests/ui/opt_opt_nonpositional.stderr
+++ b/tests/ui/opt_opt_nonpositional.stderr
diff --git a/tests/ui/opt_vec_nonpositional.rs b/tests/ui/opt_vec_nonpositional.rs
index 0f6f078..0f6f078 100755..100644
--- a/tests/ui/opt_vec_nonpositional.rs
+++ b/tests/ui/opt_vec_nonpositional.rs
diff --git a/tests/ui/opt_vec_nonpositional.stderr b/tests/ui/opt_vec_nonpositional.stderr
index c6b343f..c6b343f 100755..100644
--- a/tests/ui/opt_vec_nonpositional.stderr
+++ b/tests/ui/opt_vec_nonpositional.stderr
diff --git a/tests/ui/option_default_value.rs b/tests/ui/option_default_value.rs
index a86bc0e..a86bc0e 100755..100644
--- a/tests/ui/option_default_value.rs
+++ b/tests/ui/option_default_value.rs
diff --git a/tests/ui/option_default_value.stderr b/tests/ui/option_default_value.stderr
index 2215497..2215497 100755..100644
--- a/tests/ui/option_default_value.stderr
+++ b/tests/ui/option_default_value.stderr
diff --git a/tests/ui/option_required.rs b/tests/ui/option_required.rs
index d91afbf..d91afbf 100755..100644
--- a/tests/ui/option_required.rs
+++ b/tests/ui/option_required.rs
diff --git a/tests/ui/option_required.stderr b/tests/ui/option_required.stderr
index 0230d57..0230d57 100755..100644
--- a/tests/ui/option_required.stderr
+++ b/tests/ui/option_required.stderr
diff --git a/tests/ui/parse_empty_try_from_os.rs b/tests/ui/parse_empty_try_from_os.rs
index acfef0b..acfef0b 100755..100644
--- a/tests/ui/parse_empty_try_from_os.rs
+++ b/tests/ui/parse_empty_try_from_os.rs
diff --git a/tests/ui/parse_empty_try_from_os.stderr b/tests/ui/parse_empty_try_from_os.stderr
index 3dc9f24..3dc9f24 100755..100644
--- a/tests/ui/parse_empty_try_from_os.stderr
+++ b/tests/ui/parse_empty_try_from_os.stderr
diff --git a/tests/ui/parse_function_is_not_path.rs b/tests/ui/parse_function_is_not_path.rs
index 5eebc57..5eebc57 100755..100644
--- a/tests/ui/parse_function_is_not_path.rs
+++ b/tests/ui/parse_function_is_not_path.rs
diff --git a/tests/ui/parse_function_is_not_path.stderr b/tests/ui/parse_function_is_not_path.stderr
index 7cf7444..7cf7444 100755..100644
--- a/tests/ui/parse_function_is_not_path.stderr
+++ b/tests/ui/parse_function_is_not_path.stderr
diff --git a/tests/ui/parse_literal_spec.rs b/tests/ui/parse_literal_spec.rs
index b6f125a..b6f125a 100755..100644
--- a/tests/ui/parse_literal_spec.rs
+++ b/tests/ui/parse_literal_spec.rs
diff --git a/tests/ui/parse_literal_spec.stderr b/tests/ui/parse_literal_spec.stderr
index 6e99e8b..6e99e8b 100755..100644
--- a/tests/ui/parse_literal_spec.stderr
+++ b/tests/ui/parse_literal_spec.stderr
diff --git a/tests/ui/parse_not_zero_args.rs b/tests/ui/parse_not_zero_args.rs
index 8729178..8729178 100755..100644
--- a/tests/ui/parse_not_zero_args.rs
+++ b/tests/ui/parse_not_zero_args.rs
diff --git a/tests/ui/parse_not_zero_args.stderr b/tests/ui/parse_not_zero_args.stderr
index 34b99a4..34b99a4 100755..100644
--- a/tests/ui/parse_not_zero_args.stderr
+++ b/tests/ui/parse_not_zero_args.stderr
diff --git a/tests/ui/positional_bool.rs b/tests/ui/positional_bool.rs
index 4dbf538..4dbf538 100755..100644
--- a/tests/ui/positional_bool.rs
+++ b/tests/ui/positional_bool.rs
diff --git a/tests/ui/positional_bool.stderr b/tests/ui/positional_bool.stderr
index c3ed1ad..c3ed1ad 100755..100644
--- a/tests/ui/positional_bool.stderr
+++ b/tests/ui/positional_bool.stderr
diff --git a/tests/ui/raw.rs b/tests/ui/raw.rs
index b94f783..b94f783 100755..100644
--- a/tests/ui/raw.rs
+++ b/tests/ui/raw.rs
diff --git a/tests/ui/raw.stderr b/tests/ui/raw.stderr
index 93b5e38..93b5e38 100755..100644
--- a/tests/ui/raw.stderr
+++ b/tests/ui/raw.stderr
diff --git a/tests/ui/rename_all_wrong_casing.rs b/tests/ui/rename_all_wrong_casing.rs
index 4dabe14..4dabe14 100755..100644
--- a/tests/ui/rename_all_wrong_casing.rs
+++ b/tests/ui/rename_all_wrong_casing.rs
diff --git a/tests/ui/rename_all_wrong_casing.stderr b/tests/ui/rename_all_wrong_casing.stderr
index 2a72080..2a72080 100755..100644
--- a/tests/ui/rename_all_wrong_casing.stderr
+++ b/tests/ui/rename_all_wrong_casing.stderr
diff --git a/tests/ui/skip_flatten.rs b/tests/ui/skip_flatten.rs
index 8668ec2..8668ec2 100755..100644
--- a/tests/ui/skip_flatten.rs
+++ b/tests/ui/skip_flatten.rs
diff --git a/tests/ui/skip_flatten.stderr b/tests/ui/skip_flatten.stderr
index 76477a3..76477a3 100755..100644
--- a/tests/ui/skip_flatten.stderr
+++ b/tests/ui/skip_flatten.stderr
diff --git a/tests/ui/skip_subcommand.rs b/tests/ui/skip_subcommand.rs
index 5d21426..5d21426 100755..100644
--- a/tests/ui/skip_subcommand.rs
+++ b/tests/ui/skip_subcommand.rs
diff --git a/tests/ui/skip_subcommand.stderr b/tests/ui/skip_subcommand.stderr
index aba2d69..aba2d69 100755..100644
--- a/tests/ui/skip_subcommand.stderr
+++ b/tests/ui/skip_subcommand.stderr
diff --git a/tests/ui/skip_with_other_options.rs b/tests/ui/skip_with_other_options.rs
index 73c5342..73c5342 100755..100644
--- a/tests/ui/skip_with_other_options.rs
+++ b/tests/ui/skip_with_other_options.rs
diff --git a/tests/ui/skip_with_other_options.stderr b/tests/ui/skip_with_other_options.stderr
index 3345f92..3345f92 100755..100644
--- a/tests/ui/skip_with_other_options.stderr
+++ b/tests/ui/skip_with_other_options.stderr
diff --git a/tests/ui/skip_without_default.rs b/tests/ui/skip_without_default.rs
index bc47511..bc47511 100755..100644
--- a/tests/ui/skip_without_default.rs
+++ b/tests/ui/skip_without_default.rs
diff --git a/tests/ui/skip_without_default.stderr b/tests/ui/skip_without_default.stderr
index 330898f..b5d702a 100755..100644
--- a/tests/ui/skip_without_default.stderr
+++ b/tests/ui/skip_without_default.stderr
@@ -1,9 +1,7 @@
-error[E0277]: the trait bound `Kind: std::default::Default` is not satisfied
+error[E0277]: the trait bound `Kind: Default` is not satisfied
   --> $DIR/skip_without_default.rs:22:17
    |
 22 |     #[structopt(skip)]
-   |                 ^^^^ the trait `std::default::Default` is not implemented for `Kind`
+   |                 ^^^^ the trait `Default` is not implemented for `Kind`
    |
    = note: required by `std::default::Default::default`
-
-For more information about this error, try `rustc --explain E0277`.
diff --git a/tests/ui/struct_parse.rs b/tests/ui/struct_parse.rs
index e428b23..e428b23 100755..100644
--- a/tests/ui/struct_parse.rs
+++ b/tests/ui/struct_parse.rs
diff --git a/tests/ui/struct_parse.stderr b/tests/ui/struct_parse.stderr
index 5518214..5518214 100755..100644
--- a/tests/ui/struct_parse.stderr
+++ b/tests/ui/struct_parse.stderr
diff --git a/tests/ui/struct_subcommand.rs b/tests/ui/struct_subcommand.rs
index ac0b145..ac0b145 100755..100644
--- a/tests/ui/struct_subcommand.rs
+++ b/tests/ui/struct_subcommand.rs
diff --git a/tests/ui/struct_subcommand.stderr b/tests/ui/struct_subcommand.stderr
index 438f6f8..438f6f8 100755..100644
--- a/tests/ui/struct_subcommand.stderr
+++ b/tests/ui/struct_subcommand.stderr
diff --git a/tests/ui/structopt_empty_attr.rs b/tests/ui/structopt_empty_attr.rs
index a7fc0b9..a7fc0b9 100755..100644
--- a/tests/ui/structopt_empty_attr.rs
+++ b/tests/ui/structopt_empty_attr.rs
diff --git a/tests/ui/structopt_empty_attr.stderr b/tests/ui/structopt_empty_attr.stderr
index bd3b3ed..bd3b3ed 100755..100644
--- a/tests/ui/structopt_empty_attr.stderr
+++ b/tests/ui/structopt_empty_attr.stderr
diff --git a/tests/ui/structopt_name_value_attr.rs b/tests/ui/structopt_name_value_attr.rs
index 3d9388f..3d9388f 100755..100644
--- a/tests/ui/structopt_name_value_attr.rs
+++ b/tests/ui/structopt_name_value_attr.rs
diff --git a/tests/ui/structopt_name_value_attr.stderr b/tests/ui/structopt_name_value_attr.stderr
index 373a3b8..373a3b8 100755..100644
--- a/tests/ui/structopt_name_value_attr.stderr
+++ b/tests/ui/structopt_name_value_attr.stderr
diff --git a/tests/ui/subcommand_and_flatten.rs b/tests/ui/subcommand_and_flatten.rs
index 742ee6d..742ee6d 100755..100644
--- a/tests/ui/subcommand_and_flatten.rs
+++ b/tests/ui/subcommand_and_flatten.rs
diff --git a/tests/ui/subcommand_and_flatten.stderr b/tests/ui/subcommand_and_flatten.stderr
index cacea5e..cacea5e 100755..100644
--- a/tests/ui/subcommand_and_flatten.stderr
+++ b/tests/ui/subcommand_and_flatten.stderr
diff --git a/tests/ui/subcommand_and_methods.rs b/tests/ui/subcommand_and_methods.rs
index 890f10c..890f10c 100755..100644
--- a/tests/ui/subcommand_and_methods.rs
+++ b/tests/ui/subcommand_and_methods.rs
diff --git a/tests/ui/subcommand_and_methods.stderr b/tests/ui/subcommand_and_methods.stderr
index ccaf28d..ccaf28d 100755..100644
--- a/tests/ui/subcommand_and_methods.stderr
+++ b/tests/ui/subcommand_and_methods.stderr
diff --git a/tests/ui/subcommand_and_parse.rs b/tests/ui/subcommand_and_parse.rs
index f24e4bc..f24e4bc 100755..100644
--- a/tests/ui/subcommand_and_parse.rs
+++ b/tests/ui/subcommand_and_parse.rs
diff --git a/tests/ui/subcommand_and_parse.stderr b/tests/ui/subcommand_and_parse.stderr
index 4070056..4070056 100755..100644
--- a/tests/ui/subcommand_and_parse.stderr
+++ b/tests/ui/subcommand_and_parse.stderr
diff --git a/tests/ui/subcommand_opt_opt.rs b/tests/ui/subcommand_opt_opt.rs
index 1dd84e5..1dd84e5 100755..100644
--- a/tests/ui/subcommand_opt_opt.rs
+++ b/tests/ui/subcommand_opt_opt.rs
diff --git a/tests/ui/subcommand_opt_opt.stderr b/tests/ui/subcommand_opt_opt.stderr
index 25b37e5..25b37e5 100755..100644
--- a/tests/ui/subcommand_opt_opt.stderr
+++ b/tests/ui/subcommand_opt_opt.stderr
diff --git a/tests/ui/subcommand_opt_vec.rs b/tests/ui/subcommand_opt_vec.rs
index 17bffbf..17bffbf 100755..100644
--- a/tests/ui/subcommand_opt_vec.rs
+++ b/tests/ui/subcommand_opt_vec.rs
diff --git a/tests/ui/subcommand_opt_vec.stderr b/tests/ui/subcommand_opt_vec.stderr
index a36071b..a36071b 100755..100644
--- a/tests/ui/subcommand_opt_vec.stderr
+++ b/tests/ui/subcommand_opt_vec.stderr
diff --git a/tests/ui/tuple_struct.rs b/tests/ui/tuple_struct.rs
index af9b1d5..af9b1d5 100755..100644
--- a/tests/ui/tuple_struct.rs
+++ b/tests/ui/tuple_struct.rs
diff --git a/tests/ui/tuple_struct.stderr b/tests/ui/tuple_struct.stderr
index 31705c9..31705c9 100755..100644
--- a/tests/ui/tuple_struct.stderr
+++ b/tests/ui/tuple_struct.stderr