---

yaml
---
r: 36183
b: refs/heads/try2
c: caf6803
h: refs/heads/master
i:
  36181: 788489c
  36179: b78f927
  36175: c37b721
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: ad025102582b8c5b7d78b96683cf9e9e94dc5272
+refs/heads/try2: caf68038dd5bc129a3a9b6972a64c0752b73a004
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/test/compile-fail/enum-in-scope.rs

@@ -1,5 +1,5 @@
 enum hello = int;
 
 fn main() {
-    let hello = 0; //~ERROR declaration of `hello` shadows an enum that's in
-}
+    let hello = 0; //~ERROR declaration of `hello` shadows
+}

branches/try2/src/test/compile-fail/issue-2370-2.rs

@@ -1,9 +1,9 @@
-// error-pattern: type cat cannot be dereferenced
+// error-pattern: can only dereference structs
 struct cat {
     x: ()
 }
 
 fn main() {
     let kitty : cat = cat { x: () };
     log (error, *kitty);
-}
+}

branches/try2/src/test/compile-fail/issue-2370.rs

@@ -1,9 +1,9 @@
-// error-pattern: type cat cannot be dereferenced
+// error-pattern: can only dereference structs
 struct cat {
     foo: ()
 }
 
 fn main() {
     let nyan = cat { foo: () };
     log (error, *nyan);
-}
+}

branches/try2/src/test/compile-fail/issue-2509-a.rs

@@ -1,5 +1,5 @@
 enum foo = uint;
 
 fn main() {
-    let (foo, _) = (2, 3); //~ ERROR declaration of `foo` shadows an enum that's in scope
+    let (foo, _) = (2, 3); //~ ERROR declaration of `foo` shadows
 }