about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJonathan Turner <jonathandturner@users.noreply.github.com>2016-08-08 13:25:59 -0700
committerGitHub <noreply@github.com>2016-08-08 13:25:59 -0700
commitf835b383853fa7ceb4f51e4d7c82a57ab8f897d4 (patch)
treeff0e000cef72c338a89236a86244a28115e94289
parent7db3f8696625f9abeb15fd7726194199ba4a152b (diff)
parentdaf7c60d16bad5979cb5c7fa951214282ea67565 (diff)
downloadrust-f835b383853fa7ceb4f51e4d7c82a57ab8f897d4.tar.gz
rust-f835b383853fa7ceb4f51e4d7c82a57ab8f897d4.zip
Rollup merge of #35524 - garekkream:update-E0162-new-error-format, r=jonathandturner
Update E0162 to the new format

Part of #35233.
Fixes #35268.

r? @jonathandturner
-rw-r--r--src/librustc_const_eval/check_match.rs5
-rw-r--r--src/test/compile-fail/E0162.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 599e3ec871a..366b58e06c4 100644
--- a/src/librustc_const_eval/check_match.rs
+++ b/src/librustc_const_eval/check_match.rs
@@ -316,7 +316,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, E0162, "irrefutable if-let pattern");
+                                struct_span_err!(cx.tcx.sess, span, E0162,
+                                                "irrefutable if-let pattern")
+                                    .span_label(span, &format!("irrefutable pattern"))
+                                    .emit();
                                 printed_if_let_err = true;
                             }
                         },
diff --git a/src/test/compile-fail/E0162.rs b/src/test/compile-fail/E0162.rs
index e13b0af6f79..0b63d7c3f85 100644
--- a/src/test/compile-fail/E0162.rs
+++ b/src/test/compile-fail/E0162.rs
@@ -13,6 +13,7 @@ struct Irrefutable(i32);
 fn main() {
     let irr = Irrefutable(0);
     if let Irrefutable(x) = irr { //~ ERROR E0162
+        //~| NOTE irrefutable pattern
         println!("{}", x);
     }
 }