---

yaml
---
r: 83621
b: refs/heads/try
c: 2461b31
h: refs/heads/master
i:
  83619: 83b233d
v: v3

Author: pnkfelix

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0e4d1fc8cae42e15e00f71d9f439b01bb25a86ae
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
-refs/heads/try: 88d34ff2498e3ca8020c79c63d4501f749831f2f
+refs/heads/try: 2461b3102607c1cb4469c94bbe95d67db6c5e54d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

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

@@ -11,7 +11,6 @@
 
 use middle::const_eval::{compare_const_vals, lookup_const_by_id};
 use middle::const_eval::{eval_const_expr, const_val, const_bool, const_float};
-use middle::lint::non_uppercase_pattern_statics;
 use middle::pat_util::*;
 use middle::ty::*;
 use middle::ty;
@@ -135,29 +134,11 @@ 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 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.
-                        let ident = path.segments.last().identifier;
-                        let s = cx.tcx.sess.str_of(ident);
-                        if s.iter().any(|c| c.is_lowercase()) {
-                            cx.tcx.sess.add_lint(non_uppercase_pattern_statics,
-                                                 p.id, path.span, msg.to_owned());
-                        }
-                    }
-                    _ => {}
-                }
-            };
-
             do walk_pat(*pat) |p| {
                 if pat_matches_nan(p) {
                     cx.tcx.sess.span_warn(p.span, "unmatchable NaN in pattern, \
                                                    use the is_nan method in a guard instead");
                 }
-                pat_matches_non_uppercase_static(p);
                 true
             };
 

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

@@ -1118,6 +1118,22 @@ fn check_item_non_uppercase_statics(cx: &Context, it: &ast::item) {
     }
 }
 
+fn check_pat_non_uppercase_statics(cx: &Context, p: &ast::Pat) {
+    // Lint for constants that look like binding identifiers (#7526)
+    match (&p.node, cx.tcx.def_map.find(&p.id)) {
+        (&ast::PatIdent(_, ref path, _), Some(&ast::DefStatic(_, false))) => {
+            // last identifier alone is right choice for this lint.
+            let ident = path.segments.last().identifier;
+            let s = cx.tcx.sess.str_of(ident);
+            if s.iter().any(|c| c.is_lowercase()) {
+                cx.span_lint(non_uppercase_pattern_statics, path.span,
+                             "static constant in pattern should be all caps");
+            }
+        }
+        _ => {}
+    }
+}
+
 struct UnusedUnsafeLintVisitor { stopping_on_items: bool }
 
 impl SubitemStoppableVisitor for UnusedUnsafeLintVisitor {
@@ -1524,6 +1540,11 @@ struct LintCheckVisitor;
 
 impl Visitor<@mut Context> for LintCheckVisitor {
 
+    fn visit_pat(&mut self, p:@ast::Pat, cx: @mut Context) {
+        check_pat_non_uppercase_statics(cx, p);
+        visit::walk_pat(self, p, cx);
+    }
+
     fn visit_item(&mut self, it:@ast::item, cx: @mut Context) {
 
                 do cx.with_lint_attrs(it.attrs) {