---

yaml
---
r: 145661
b: refs/heads/try2
c: 06f4690
h: refs/heads/master
i:
  145659: 7a4c7d3
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: 155857f5488f2b6ca04c3abe6ac22833028c1497
+refs/heads/try2: 06f46902caf4a98132229237820d482f99e147ea
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -28,7 +28,7 @@ mod m {
 }
 
 fn g() {
-    use m::aha;
+    use self::m::aha;
     let r = match (0,0) {
         (0, aha) => 0,
         //~^ ERROR static constant in pattern should be all caps
@@ -37,7 +37,22 @@ fn g() {
     assert!(r == 1);
 }
 
+mod n {
+    pub static OKAY : int = 8;
+}
+
+fn h() {
+    use not_okay = self::n::OKAY;
+    let r = match (0,0) {
+        (0, not_okay) => 0,
+        //~^ ERROR static constant in pattern should be all caps
+        (x, y)   => 1 + x + y,
+    };
+    assert!(r == 1);
+}
+
 fn main () {
     f();
     g();
+    h();
 }

branches/try2/src/test/run-pass/match-static-const-rename.rs

@@ -38,7 +38,7 @@ mod m {
 }
 
 fn g() {
-    use AHA = m::aha;
+    use AHA = self::m::aha;
     let r = match (0,0) {
         (0, AHA) => 0,
         (x, y)   => 1 + x + y,
@@ -53,12 +53,12 @@ fn g() {
 
 fn h() {
     let r = match (0,0) {
-        (0, m::aha) => 0,
+        (0, self::m::aha) => 0,
         (x, y)      => 1 + x + y,
     };
     assert!(r == 1);
     let r = match (0,7) {
-        (0, m::aha) => 0,
+        (0, self::m::aha) => 0,
         (x, y)      => 1 + x + y,
     };
     assert!(r == 0);