about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorJonathan Turner <jonathandturner@users.noreply.github.com>2016-09-02 15:28:52 -0700
committerGitHub <noreply@github.com>2016-09-02 15:28:52 -0700
commit5284bee03a94cf5c9c8a84f42c17f563ae76bca4 (patch)
treef5b3c415121c0a25f548968f6a953d9612f542fc /src
parent6736bad424923cd2915ff79e891e1ff02f16574b (diff)
parent7f95bb0dbd70e838d7cc12520135b08853c8b192 (diff)
downloadrust-5284bee03a94cf5c9c8a84f42c17f563ae76bca4.tar.gz
rust-5284bee03a94cf5c9c8a84f42c17f563ae76bca4.zip
Rollup merge of #36210 - EugeneGonzalez:E0529, r=jonathandturner
Fixed E0529's label and unit test

Fixes #36195 part of #35233.

This is ready for review, but will likely fail Travis due to #36138. I changed the wording of the label, so feedback on that would be appreciated.

r? @jonathandturner
Diffstat (limited to 'src')
-rw-r--r--src/librustc_typeck/check/_match.rs5
-rw-r--r--src/test/compile-fail/E0529.rs4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/librustc_typeck/check/_match.rs b/src/librustc_typeck/check/_match.rs
index e1ce89f0ab5..f8a2e82edc2 100644
--- a/src/librustc_typeck/check/_match.rs
+++ b/src/librustc_typeck/check/_match.rs
@@ -273,7 +273,10 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
                                     _ => {}
                                 }
                             }
-                            err.emit();
+
+                            err.span_label( pat.span,
+                                &format!("pattern cannot match with input type `{}`", expected_ty)
+                            ).emit();
                         }
                         (tcx.types.err, tcx.types.err)
                     }
diff --git a/src/test/compile-fail/E0529.rs b/src/test/compile-fail/E0529.rs
index 488fe7c7763..18d3e68816a 100644
--- a/src/test/compile-fail/E0529.rs
+++ b/src/test/compile-fail/E0529.rs
@@ -13,7 +13,9 @@
 fn main() {
     let r: f32 = 1.0;
     match r {
-        [a, b] => { //~ ERROR E0529
+        [a, b] => {
+        //~^ ERROR E0529
+        //~| NOTE pattern cannot match with input type `f32`
         }
     }
 }