From 8cc96e49ed0e27012786a15bcd62b142e0b08285 Mon Sep 17 00:00:00 2001 From: CreepySkeleton Date: Mon, 30 Nov 2020 14:25:38 +0300 Subject: [PATCH] Adjust .stderr files --- tests/ui/external_subcommand_wrong_type.stderr | 6 +++--- tests/ui/non_existent_attr.stderr | 4 ++-- tests/ui/skip_without_default.stderr | 6 ++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/tests/ui/external_subcommand_wrong_type.stderr b/tests/ui/external_subcommand_wrong_type.stderr index 1966225f..73f12d28 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) - | ^^^^^^^ expected struct `std::ffi::CString`, found struct `std::ffi::OsString` + | ^^^^^^^ expected struct `CString`, found struct `OsString` | - = note: expected struct `std::vec::Vec` - found struct `std::vec::Vec` + = note: expected struct `Vec` + found struct `Vec` diff --git a/tests/ui/non_existent_attr.stderr b/tests/ui/non_existent_attr.stderr index e5edb56a..61f784eb 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/skip_without_default.stderr b/tests/ui/skip_without_default.stderr index 330898f6..b5d702a7 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`.