diff options
| author | bors <bors@rust-lang.org> | 2018-02-03 01:26:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-02-03 01:26:56 +0000 |
| commit | 6c15dffc43d86c316e3d6bf9f9ffd48d8b5f4a3e (patch) | |
| tree | 40f2aac56b2262ce76ed9eeb9e30b123b4f9ca1d /src/test/ui/impl-trait | |
| parent | 616b66dca25a67321b1654e5a65acc6337d63cf4 (diff) | |
| parent | 67696be160cc35ba5e54086a42225d9c1f81b275 (diff) | |
| download | rust-6c15dffc43d86c316e3d6bf9f9ffd48d8b5f4a3e.tar.gz rust-6c15dffc43d86c316e3d6bf9f9ffd48d8b5f4a3e.zip | |
Auto merge of #47791 - estebank:mismatched-trait-impl, r=nikomatsakis
Tweak presentation on lifetime trait mismatch - On trait/impl method discrepancy, add label pointing at trait signature. - Point only at method definition when referring to named lifetimes on lifetime mismatch. - When the sub and sup expectations are the same, tweak the output to avoid repeated spans. Fix #30790, CC #18759.
Diffstat (limited to 'src/test/ui/impl-trait')
| -rw-r--r-- | src/test/ui/impl-trait/trait_type.stderr | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/ui/impl-trait/trait_type.stderr b/src/test/ui/impl-trait/trait_type.stderr index 7a0d01a8ec2..1417c71ca12 100644 --- a/src/test/ui/impl-trait/trait_type.stderr +++ b/src/test/ui/impl-trait/trait_type.stderr @@ -2,7 +2,7 @@ error[E0053]: method `fmt` has an incompatible type for trait --> $DIR/trait_type.rs:17:4 | 17 | fn fmt(&self, x: &str) -> () { } - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ types differ in mutability + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ types differ in mutability | = note: expected type `fn(&MyType, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error>` found type `fn(&MyType, &str)` @@ -19,7 +19,7 @@ error[E0186]: method `fmt` has a `&self` declaration in the trait, but not in th --> $DIR/trait_type.rs:27:4 | 27 | fn fmt() -> () { } - | ^^^^^^^^^^^^^^^^^^ expected `&self` in impl + | ^^^^^^^^^^^^^^ expected `&self` in impl | = note: `fmt` from trait: `fn(&Self, &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error>` |