about summary refs log tree commit diff
path: root/src/test/ui/methods
diff options
context:
space:
mode:
authorEsteban Küber <esteban@kuber.com.ar>2019-11-14 23:45:30 -0800
committerEsteban Küber <esteban@kuber.com.ar>2019-11-18 11:03:03 -0800
commit94c642546497dd4c04609bd6dbe7631fb56df1fa (patch)
treedeb8c44a34db3e9e6cfd3e421e83c5d7317cacab /src/test/ui/methods
parentb2e6aef0731990c98a6fb7ac6f890aa359a5e9e6 (diff)
Remove E0308 note when primary label has all info
Diffstat (limited to 'src/test/ui/methods')
-rw-r--r--src/test/ui/methods/method-deref-to-same-trait-object-with-separate-params.stderr15
-rw-r--r--src/test/ui/methods/method-self-arg-1.rs2
-rw-r--r--src/test/ui/methods/method-self-arg-1.stderr5
3 files changed, 1 insertions, 21 deletions
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 99e0a466817..12f75d009e2 100644
--- 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 unit 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 unit type `()`
-                   found type `u64`
 
 error[E0034]: multiple applicable items in scope
   --> $DIR/method-deref-to-same-trait-object-with-separate-params.rs:120:15
@@ -46,27 +40,18 @@ error[E0308]: mismatched types
    |
 LL |     let _seetype: () = z;
    |                        ^ expected (), found u8
-   |
-   = note: expected unit 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 unit 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 unit type `()`
-                   found type `u32`
 
 error: aborting due to 6 previous errors
 
diff --git a/src/test/ui/methods/method-self-arg-1.rs b/src/test/ui/methods/method-self-arg-1.rs
index 169c14c0f53..c58040cdf5f 100644
--- a/src/test/ui/methods/method-self-arg-1.rs
+++ b/src/test/ui/methods/method-self-arg-1.rs
@@ -10,8 +10,6 @@ fn main() {
     let x = Foo;
     Foo::bar(x); //~  ERROR mismatched types
                  //~| expected &Foo, found struct `Foo`
-                 //~| expected reference `&Foo`
-                 //~| found struct `Foo`
     Foo::bar(&42); //~  ERROR mismatched types
                       //~| expected struct `Foo`, found integer
                       //~| expected reference `&Foo`
diff --git a/src/test/ui/methods/method-self-arg-1.stderr b/src/test/ui/methods/method-self-arg-1.stderr
index e0cb0915fe1..a56164db1b6 100644
--- a/src/test/ui/methods/method-self-arg-1.stderr
+++ b/src/test/ui/methods/method-self-arg-1.stderr
@@ -6,12 +6,9 @@ LL |     Foo::bar(x);
    |              |
    |              expected &Foo, found struct `Foo`
    |              help: consider borrowing here: `&x`
-   |
-   = note: expected reference `&Foo`
-                 found struct `Foo`
 
 error[E0308]: mismatched types
-  --> $DIR/method-self-arg-1.rs:15:14
+  --> $DIR/method-self-arg-1.rs:13:14
    |
 LL |     Foo::bar(&42);
    |              ^^^ expected struct `Foo`, found integer