about summary refs log tree commit diff
path: root/src/test/ui/pattern
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/pattern
parentb2e6aef0731990c98a6fb7ac6f890aa359a5e9e6 (diff)
downloadrust-94c642546497dd4c04609bd6dbe7631fb56df1fa.tar.gz
rust-94c642546497dd4c04609bd6dbe7631fb56df1fa.zip
Remove E0308 note when primary label has all info
Diffstat (limited to 'src/test/ui/pattern')
-rw-r--r--src/test/ui/pattern/pat-tuple-bad-type.stderr3
-rw-r--r--src/test/ui/pattern/pattern-error-continue.rs2
-rw-r--r--src/test/ui/pattern/pattern-error-continue.stderr7
3 files changed, 2 insertions, 10 deletions
diff --git a/src/test/ui/pattern/pat-tuple-bad-type.stderr b/src/test/ui/pattern/pat-tuple-bad-type.stderr
index 7a599b07f1e..a6224d89894 100644
--- a/src/test/ui/pattern/pat-tuple-bad-type.stderr
+++ b/src/test/ui/pattern/pat-tuple-bad-type.stderr
@@ -14,9 +14,6 @@ error[E0308]: mismatched types
    |
 LL |         (..) => {}
    |         ^^^^ expected u8, found ()
-   |
-   = note:   expected type `u8`
-           found unit type `()`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/pattern/pattern-error-continue.rs b/src/test/ui/pattern/pattern-error-continue.rs
index f21da3b55dc..eb57210f454 100644
--- a/src/test/ui/pattern/pattern-error-continue.rs
+++ b/src/test/ui/pattern/pattern-error-continue.rs
@@ -22,8 +22,6 @@ fn main() {
         S { .. } => (),
         //~^ ERROR mismatched types
         //~| expected char, found struct `S`
-        //~| expected type `char`
-        //~| found struct `S`
 
         _ => ()
     }
diff --git a/src/test/ui/pattern/pattern-error-continue.stderr b/src/test/ui/pattern/pattern-error-continue.stderr
index c8d80043fdb..22da0d5e0db 100644
--- a/src/test/ui/pattern/pattern-error-continue.stderr
+++ b/src/test/ui/pattern/pattern-error-continue.stderr
@@ -1,5 +1,5 @@
 error[E0433]: failed to resolve: use of undeclared type or module `E`
-  --> $DIR/pattern-error-continue.rs:35:9
+  --> $DIR/pattern-error-continue.rs:33:9
    |
 LL |         E::V => {}
    |         ^ use of undeclared type or module `E`
@@ -31,12 +31,9 @@ LL |     match 'c' {
    |           --- this match expression has type `char`
 LL |         S { .. } => (),
    |         ^^^^^^^^ expected char, found struct `S`
-   |
-   = note: expected type `char`
-            found struct `S`
 
 error[E0308]: mismatched types
-  --> $DIR/pattern-error-continue.rs:30:7
+  --> $DIR/pattern-error-continue.rs:28:7
    |
 LL |     f(true);
    |       ^^^^ expected char, found bool