diff options
| author | Haibo Huang <hhb@google.com> | 2020-12-01 13:25:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-01 13:25:49 +0000 |
| commit | a9f136f0f500d3f32a49e1cb5829491d98d2a669 (patch) | |
| tree | cae5bc70a957388a86ea728e66409f385be9b6ce | |
| parent | 0db6aa7d9458221968f0109203476ecf86fc2758 (diff) | |
| parent | 948743e0981d71b2c08a9d20d6d7b672384c4d9f (diff) | |
| download | structopt-a9f136f0f500d3f32a49e1cb5829491d98d2a669.tar.gz | |
Upgrade rust/crates/structopt to 0.3.21 am: 1fc28252fb am: 948743e098
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/structopt/+/1514955
Change-Id: I81a73aad1c3c4cc78520215ebbf7e88df35af534
126 files changed, 44 insertions, 21 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index ae54c03..7d10f0d 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,5 +1,5 @@ { "git": { - "sha1": "6fa8d68298eab6b4eb94b4b40ce64992b20c7263" + "sha1": "8bda3b64daf53f0ed6bb6bee2c767a63c7c477fc" } } diff --git a/.gitignore b/.gitignore index 4467abb..4467abb 100755..100644 --- a/.gitignore +++ b/.gitignore diff --git a/.travis.yml b/.travis.yml index 14f5a6c..14f5a6c 100755..100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,10 +27,10 @@ rust_library { // proc-macro2-1.0.24 "default,proc-macro" // quote-1.0.7 "default,proc-macro" // strsim-0.8.0 -// structopt-derive-0.4.13 -// syn-1.0.48 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit" +// structopt-derive-0.4.14 +// syn-1.0.53 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit" // textwrap-0.11.0 -// unicode-segmentation-1.6.0 +// unicode-segmentation-1.7.1 // unicode-width-0.1.8 "default" // unicode-xid-0.2.1 "default" // vec_map-0.8.2 diff --git a/CHANGELOG.md b/CHANGELOG.md index ccdde68..650afea 100755..100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# v0.3.21 (2020-11-30) + +* Fixed [another breakage](https://github.com/TeXitoi/structopt/issues/447) + when the struct is placed inside a `macro_rules!` macro. + # v0.3.20 (2020-10-12) * Fixed [a breakage](https://github.com/TeXitoi/structopt/issues/439) @@ -13,7 +13,7 @@ [package] edition = "2018" name = "structopt" -version = "0.3.20" +version = "0.3.21" authors = ["Guillaume Pinot <texitoi@texitoi.eu>", "others"] description = "Parse command line argument by defining a struct." documentation = "https://docs.rs/structopt" @@ -35,7 +35,7 @@ optional = true package = "paw" [dependencies.structopt-derive] -version = "=0.4.13" +version = "=0.4.14" [dev-dependencies.rustversion] version = "1" diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 7c4efaf..fdad9ef 100755..100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,6 +1,6 @@ [package] name = "structopt" -version = "0.3.20" +version = "0.3.21" edition = "2018" authors = ["Guillaume Pinot <texitoi@texitoi.eu>", "others"] description = "Parse command line argument by defining a struct." @@ -28,7 +28,7 @@ travis-ci = { repository = "TeXitoi/structopt" } [dependencies] clap = { version = "2.33", default-features = false } -structopt-derive = { path = "structopt-derive", version = "=0.4.13" } +structopt-derive = { path = "structopt-derive", version = "=0.4.14" } lazy_static = "1.4.0" paw_dep = { version = "1", optional = true, package = "paw" } diff --git a/LICENSE-APACHE b/LICENSE-APACHE index 261eeb9..261eeb9 100755..100644 --- a/LICENSE-APACHE +++ b/LICENSE-APACHE diff --git a/LICENSE-MIT b/LICENSE-MIT index e931b83..e931b83 100755..100644 --- a/LICENSE-MIT +++ b/LICENSE-MIT @@ -7,13 +7,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/structopt/structopt-0.3.20.crate" + value: "https://static.crates.io/crates/structopt/structopt-0.3.21.crate" } - version: "0.3.20" + version: "0.3.21" license_type: NOTICE last_upgrade_date { year: 2020 - month: 10 - day: 26 + month: 11 + day: 30 } } diff --git a/README.md b/README.md index 6609488..6609488 100755..100644 --- a/README.md +++ b/README.md diff --git a/examples/README.md b/examples/README.md index b485393..b485393 100755..100644 --- a/examples/README.md +++ b/examples/README.md diff --git a/examples/after_help.rs b/examples/after_help.rs index db2845f..db2845f 100755..100644 --- a/examples/after_help.rs +++ b/examples/after_help.rs diff --git a/examples/at_least_two.rs b/examples/at_least_two.rs index 683db50..683db50 100755..100644 --- a/examples/at_least_two.rs +++ b/examples/at_least_two.rs diff --git a/examples/basic.rs b/examples/basic.rs index 510e0e0..510e0e0 100755..100644 --- a/examples/basic.rs +++ b/examples/basic.rs diff --git a/examples/deny_missing_docs.rs b/examples/deny_missing_docs.rs index 82b1e63..82b1e63 100755..100644 --- a/examples/deny_missing_docs.rs +++ b/examples/deny_missing_docs.rs diff --git a/examples/doc_comments.rs b/examples/doc_comments.rs index 810101f..810101f 100755..100644 --- a/examples/doc_comments.rs +++ b/examples/doc_comments.rs diff --git a/examples/enum_in_args.rs b/examples/enum_in_args.rs index 70347da..70347da 100755..100644 --- a/examples/enum_in_args.rs +++ b/examples/enum_in_args.rs diff --git a/examples/enum_tuple.rs b/examples/enum_tuple.rs index 0bad2e6..0bad2e6 100755..100644 --- a/examples/enum_tuple.rs +++ b/examples/enum_tuple.rs diff --git a/examples/env.rs b/examples/env.rs index 0477089..0477089 100755..100644 --- a/examples/env.rs +++ b/examples/env.rs diff --git a/examples/example.rs b/examples/example.rs index 7a9a514..7a9a514 100755..100644 --- a/examples/example.rs +++ b/examples/example.rs diff --git a/examples/flatten.rs b/examples/flatten.rs index d51647f..d51647f 100755..100644 --- a/examples/flatten.rs +++ b/examples/flatten.rs diff --git a/examples/gen_completions.rs b/examples/gen_completions.rs index 6dbd97f..6dbd97f 100755..100644 --- a/examples/gen_completions.rs +++ b/examples/gen_completions.rs diff --git a/examples/git.rs b/examples/git.rs index 494e9d1..494e9d1 100755..100644 --- a/examples/git.rs +++ b/examples/git.rs diff --git a/examples/group.rs b/examples/group.rs index d53de6a..d53de6a 100755..100644 --- a/examples/group.rs +++ b/examples/group.rs diff --git a/examples/keyvalue.rs b/examples/keyvalue.rs index 12ce6fc..12ce6fc 100755..100644 --- a/examples/keyvalue.rs +++ b/examples/keyvalue.rs diff --git a/examples/negative_flag.rs b/examples/negative_flag.rs index b178bf5..b178bf5 100755..100644 --- a/examples/negative_flag.rs +++ b/examples/negative_flag.rs diff --git a/examples/no_version.rs b/examples/no_version.rs index a542ec1..a542ec1 100755..100644 --- a/examples/no_version.rs +++ b/examples/no_version.rs diff --git a/examples/rename_all.rs b/examples/rename_all.rs index c7c3538..c7c3538 100755..100644 --- a/examples/rename_all.rs +++ b/examples/rename_all.rs diff --git a/examples/required_if.rs b/examples/required_if.rs index cb6b414..cb6b414 100755..100644 --- a/examples/required_if.rs +++ b/examples/required_if.rs diff --git a/examples/skip.rs b/examples/skip.rs index 1f44769..1f44769 100755..100644 --- a/examples/skip.rs +++ b/examples/skip.rs diff --git a/examples/subcommand_aliases.rs b/examples/subcommand_aliases.rs index 30b8cc3..30b8cc3 100755..100644 --- a/examples/subcommand_aliases.rs +++ b/examples/subcommand_aliases.rs diff --git a/examples/true_or_false.rs b/examples/true_or_false.rs index 31a543e..31a543e 100755..100644 --- a/examples/true_or_false.rs +++ b/examples/true_or_false.rs diff --git a/link-check-headers.json b/link-check-headers.json index c1bb248..c1bb248 100755..100644 --- a/link-check-headers.json +++ b/link-check-headers.json diff --git a/src/lib.rs b/src/lib.rs index fb4ad85..fb4ad85 100755..100644 --- a/src/lib.rs +++ b/src/lib.rs diff --git a/tests/argument_naming.rs b/tests/argument_naming.rs index 88b549d..88b549d 100755..100644 --- a/tests/argument_naming.rs +++ b/tests/argument_naming.rs diff --git a/tests/arguments.rs b/tests/arguments.rs index 96a0938..96a0938 100755..100644 --- a/tests/arguments.rs +++ b/tests/arguments.rs diff --git a/tests/author_version_about.rs b/tests/author_version_about.rs index 0f1c8b5..0f1c8b5 100755..100644 --- a/tests/author_version_about.rs +++ b/tests/author_version_about.rs diff --git a/tests/custom-string-parsers.rs b/tests/custom-string-parsers.rs index 89070ed..89070ed 100755..100644 --- a/tests/custom-string-parsers.rs +++ b/tests/custom-string-parsers.rs diff --git a/tests/default_value.rs b/tests/default_value.rs index 383bd23..383bd23 100755..100644 --- a/tests/default_value.rs +++ b/tests/default_value.rs diff --git a/tests/deny-warnings.rs b/tests/deny-warnings.rs index 721204a..721204a 100755..100644 --- a/tests/deny-warnings.rs +++ b/tests/deny-warnings.rs diff --git a/tests/doc-comments-help.rs b/tests/doc-comments-help.rs index 1d31683..1d31683 100755..100644 --- a/tests/doc-comments-help.rs +++ b/tests/doc-comments-help.rs diff --git a/tests/explicit_name_no_renaming.rs b/tests/explicit_name_no_renaming.rs index eff7a86..eff7a86 100755..100644 --- a/tests/explicit_name_no_renaming.rs +++ b/tests/explicit_name_no_renaming.rs diff --git a/tests/flags.rs b/tests/flags.rs index 39a5dc3..39a5dc3 100755..100644 --- a/tests/flags.rs +++ b/tests/flags.rs diff --git a/tests/flatten.rs b/tests/flatten.rs index 05de185..05de185 100755..100644 --- a/tests/flatten.rs +++ b/tests/flatten.rs diff --git a/tests/issues.rs b/tests/issues.rs index 8b4ac4b..8b4ac4b 100755..100644 --- a/tests/issues.rs +++ b/tests/issues.rs diff --git a/tests/macro-errors.rs b/tests/macro-errors.rs index 54b405a..54b405a 100755..100644 --- a/tests/macro-errors.rs +++ b/tests/macro-errors.rs diff --git a/tests/nested-subcommands.rs b/tests/nested-subcommands.rs index 1fbd166..1fbd166 100755..100644 --- a/tests/nested-subcommands.rs +++ b/tests/nested-subcommands.rs diff --git a/tests/non_literal_attributes.rs b/tests/non_literal_attributes.rs index 75b6b71..75b6b71 100755..100644 --- a/tests/non_literal_attributes.rs +++ b/tests/non_literal_attributes.rs diff --git a/tests/options.rs b/tests/options.rs index 803abb4..803abb4 100755..100644 --- a/tests/options.rs +++ b/tests/options.rs diff --git a/tests/privacy.rs b/tests/privacy.rs index 730bbce..730bbce 100755..100644 --- a/tests/privacy.rs +++ b/tests/privacy.rs diff --git a/tests/raw_bool_literal.rs b/tests/raw_bool_literal.rs index faf8628..faf8628 100755..100644 --- a/tests/raw_bool_literal.rs +++ b/tests/raw_bool_literal.rs diff --git a/tests/raw_idents.rs b/tests/raw_idents.rs index c00ff66..c00ff66 100755..100644 --- a/tests/raw_idents.rs +++ b/tests/raw_idents.rs diff --git a/tests/regressions.rs b/tests/regressions.rs index 876e7ed..3847dc2 100755..100644 --- a/tests/regressions.rs +++ b/tests/regressions.rs @@ -23,3 +23,23 @@ fn invisible_group_issue_439() { assert!(!help.contains("--x <x>")); Opts::from_iter_safe(&["test", "--x"]).unwrap(); } + +#[test] +fn issue_447() { + macro_rules! Command { + ( $name:ident, [ + #[$meta:meta] $var:ident($inner:ty) + ] ) => { + #[derive(Debug, PartialEq, structopt::StructOpt)] + enum $name { + #[$meta] + $var($inner), + } + }; + } + + Command! {GitCmd, [ + #[structopt(external_subcommand)] + Ext(Vec<String>) + ]} +} diff --git a/tests/rename_all_env.rs b/tests/rename_all_env.rs index 1979e84..1979e84 100755..100644 --- a/tests/rename_all_env.rs +++ b/tests/rename_all_env.rs diff --git a/tests/skip.rs b/tests/skip.rs index 47682d8..47682d8 100755..100644 --- a/tests/skip.rs +++ b/tests/skip.rs diff --git a/tests/special_types.rs b/tests/special_types.rs index ffed5e2..ffed5e2 100755..100644 --- a/tests/special_types.rs +++ b/tests/special_types.rs diff --git a/tests/subcommands.rs b/tests/subcommands.rs index 1fc8e76..1fc8e76 100755..100644 --- a/tests/subcommands.rs +++ b/tests/subcommands.rs 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 diff --git a/tests/utils.rs b/tests/utils.rs index c0684a2..c0684a2 100755..100644 --- a/tests/utils.rs +++ b/tests/utils.rs diff --git a/tests/we_need_syn_full.rs b/tests/we_need_syn_full.rs index cc6eca8..cc6eca8 100755..100644 --- a/tests/we_need_syn_full.rs +++ b/tests/we_need_syn_full.rs |