Remove E0308 note when primary label has all info

[rust.git] / src / test / ui / methods / method-deref-to-same-trait-object-with-separate-params.stderr

diff --git a/src/test/ui/methods/method-deref-to-same-trait-object-with-separate-params.stderr b/src/test/ui/methods/method-deref-to-same-trait-object-with-separate-params.stderr
index d6fac7025a479e6edd6deb16b54f7bb3f701410f..12f75d009e2e54a32f9766824e2137878e575608 100644 (file)
--- a/src/test/ui/methods/method-deref-to-same-trait-object-with-separate-params.stderr
+++ b/src/test/ui/methods/method-deref-to-same-trait-object-with-separate-params.stderr
@@ -3,18 +3,12 @@ error[E0308]: mismatched types
    |
 LL |     let _seetype: () = z;
    |                        ^ expected (), found u32
-   |
-   = note: expected type `()`
-              found type `u32`
 
 error[E0308]: mismatched types
   --> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:102:24
    |
 LL |     let _seetype: () = z;
    |                        ^ expected (), found u64
-   |
-   = note: expected type `()`
-              found type `u64`
 
 error[E0034]: multiple applicable items in scope
   --> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:120:15
@@ -27,11 +21,13 @@ note: candidate #1 is defined in an impl of the trait `internal::X` for the type
    |
 LL |         fn foo(self: Smaht<Self, u64>) -> u64 {
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = help: to disambiguate the method call, write `internal::X::foo(x)` instead
 note: candidate #2 is defined in an impl of the trait `nuisance_foo::NuisanceFoo` for the type `_`
   --> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:70:9
    |
 LL |         fn foo(self) {}
    |         ^^^^^^^^^^^^
+   = help: to disambiguate the method call, write `nuisance_foo::NuisanceFoo::foo(x)` instead
 note: candidate #3 is defined in the trait `FinalFoo`
   --> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:57:5
    |
@@ -44,27 +40,18 @@ error[E0308]: mismatched types
    |
 LL |     let _seetype: () = z;
    |                        ^ expected (), found u8
-   |
-   = note: expected type `()`
-              found type `u8`
 
 error[E0308]: mismatched types
   --> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:155:24
    |
 LL |     let _seetype: () = z;
    |                        ^ expected (), found u32
-   |
-   = note: expected type `()`
-              found type `u32`
 
 error[E0308]: mismatched types
   --> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:172:24
    |
 LL |     let _seetype: () = z;
    |                        ^ expected (), found u32
-   |
-   = note: expected type `()`
-              found type `u32`
 
 error: aborting due to 6 previous errors