about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGavin Baker <gavinb@antonym.org>2016-08-29 12:52:02 +1000
committerGavin Baker <gavinb@antonym.org>2016-08-30 09:50:55 +1000
commit28c5edb9f6a35dcd1bf4af102457d26a2de9d76e (patch)
tree9fddb7a68bbdec9341d30b8c013bac3d939a640a
parent6355528ffda28e77850f739d5c51ab48e8a68bb1 (diff)
downloadrust-28c5edb9f6a35dcd1bf4af102457d26a2de9d76e.tar.gz
rust-28c5edb9f6a35dcd1bf4af102457d26a2de9d76e.zip
E0165 Update error format #35270
- Fixes #35270
- Part of #35233

r? @jonathandturner
-rw-r--r--src/librustc_const_eval/check_match.rs5
-rw-r--r--src/test/compile-fail/E0165.rs1
2 files changed, 5 insertions, 1 deletions
diff --git a/src/librustc_const_eval/check_match.rs b/src/librustc_const_eval/check_match.rs
index 82c142c919e..e71a780dd89 100644
--- a/src/librustc_const_eval/check_match.rs
+++ b/src/librustc_const_eval/check_match.rs
@@ -324,7 +324,10 @@ fn check_arms(cx: &MatchCheckCtxt,
                             let &(ref first_arm_pats, _) = &arms[0];
                             let first_pat = &first_arm_pats[0];
                             let span = first_pat.span;
-                            span_err!(cx.tcx.sess, span, E0165, "irrefutable while-let pattern");
+                            struct_span_err!(cx.tcx.sess, span, E0165,
+                                             "irrefutable while-let pattern")
+                                .span_label(span, &format!("irrefutable pattern"))
+                                .emit();
                         },
 
                         hir::MatchSource::ForLoopDesugar => {
diff --git a/src/test/compile-fail/E0165.rs b/src/test/compile-fail/E0165.rs
index cca714bbcc1..142635fc6ee 100644
--- a/src/test/compile-fail/E0165.rs
+++ b/src/test/compile-fail/E0165.rs
@@ -13,6 +13,7 @@ struct Irrefutable(i32);
 fn main() {
     let irr = Irrefutable(0);
     while let Irrefutable(x) = irr { //~ ERROR E0165
+                                     //~| irrefutable pattern
         // ...
     }
 }