---

yaml
---
r: 81271
b: refs/heads/snap-stage3
c: 155857f
h: refs/heads/master
i:
  81269: 3251639
  81267: f0ded26
  81263: bdf8f47
v: v3

Author: pnkfelix

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 8d6f4c207a5a9cf8721d4cd2c884390eb3d5e61f
+refs/heads/snap-stage3: 155857f5488f2b6ca04c3abe6ac22833028c1497
 refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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/snap-stage3/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/snap-stage3/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);