---

yaml
---
r: 145660
b: refs/heads/try2
c: 155857f
h: refs/heads/master
v: v3

Author: pnkfelix

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 8d6f4c207a5a9cf8721d4cd2c884390eb3d5e61f
+refs/heads/try2: 155857f5488f2b6ca04c3abe6ac22833028c1497
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/check_match.rs

@@ -137,7 +137,7 @@ pub fn check_arms(cx: &MatchCheckCtxt, arms: &[Arm]) {
 
             // Lint for constants that look like binding identifiers (#7526)
             let pat_matches_non_uppercase_static: &fn(@Pat) = |p| {
-                let msg = "static constant in pattern should have an uppercase identifier";
+                let msg = "static constant in pattern should be all caps";
                 match (&p.node, cx.tcx.def_map.find(&p.id)) {
                     (&PatIdent(_, ref path, _), Some(&DefStatic(_, false))) => {
                         // last identifier alone is right choice for this lint.

branches/try2/src/librustc/middle/lint.rs

@@ -213,7 +213,7 @@ static lint_table: &'static [(&'static str, LintSpec)] = &[
     ("non_uppercase_pattern_statics",
      LintSpec {
          lint: non_uppercase_pattern_statics,
-         desc: "static constants in match patterns should be uppercased",
+         desc: "static constants in match patterns should be all caps",
          default: warn
      }),
 

branches/try2/src/test/compile-fail/match-static-const-lc.rs

@@ -17,7 +17,7 @@ pub static a : int = 97;
 fn f() {
     let r = match (0,0) {
         (0, a) => 0,
-        //~^ ERROR static constant in pattern should have an uppercase id
+        //~^ ERROR static constant in pattern should be all caps
         (x, y) => 1 + x + y,
     };
     assert!(r == 1);
@@ -31,7 +31,7 @@ fn g() {
     use m::aha;
     let r = match (0,0) {
         (0, aha) => 0,
-        //~^ ERROR static constant in pattern should have an uppercase id
+        //~^ ERROR static constant in pattern should be all caps
         (x, y)   => 1 + x + y,
     };
     assert!(r == 1);