---

yaml
---
r: 36318
b: refs/heads/try2
c: f8bd955
h: refs/heads/master
v: v3

Author: catamorphism

[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: d4cc7db138a1e8f81d50c4b451f4a5c5c3f45f74
+refs/heads/try2: f8bd95589fceb893e5244f8f94e010a8b30f6529
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/test/auxiliary/cci_class_5.rs

@@ -1,20 +1,15 @@
 mod kitties {
-    #[legacy_exports];
 
-struct cat {
-  priv {
-    mut meows : uint,
-  }
-
-  how_hungry : int,
-
-}
+    pub struct cat {
+        priv mut meows : uint,
+        how_hungry : int,
+    }
 
     impl cat {
-      priv fn nap() { for uint::range(1u, 10000u) |_i|{}}
+      priv fn nap() { for uint::range(1, 10000u) |_i|{}}
     }
 
-    fn cat(in_x : uint, in_y : int) -> cat {
+    pub fn cat(in_x : uint, in_y : int) -> cat {
         cat {
             meows: in_x,
             how_hungry: in_y

branches/try2/src/test/compile-fail/omitted-arg-wrong-types.rs

@@ -1,5 +1,4 @@
-// xfail-test
-
+// xfail-test - #2093
 fn let_in<T>(x: T, f: fn(T)) {}
 
 fn main() {

branches/try2/src/test/compile-fail/private-method-cross-crate.rs

@@ -1,11 +1,11 @@
 // error-pattern:attempted access of field `nap` on type
+// xfail-test Cross-crate impl method privacy doesn't work
 // xfail-fast
-// xfail-test
 // aux-build:cci_class_5.rs
-use cci_class_5;
+extern mod cci_class_5;
 use cci_class_5::kitties::*;
 
 fn main() {
-  let nyan : cat = cat(52u, 99);
+  let nyan : cat = cat(52, 99);
   nyan.nap();
 }

branches/try2/src/test/compile-fail/regions-out-of-scope-slice.rs

@@ -1,12 +1,11 @@
-// xfail-test
-
+// xfail-test blk region isn't supported in the front-end
 fn foo(cond: bool) {
     // Here we will infer a type that uses the
     // region of the if stmt then block, but in the scope:
     let mut x; //~ ERROR foo
 
     if cond {
-        x = &[1,2,3]blk;
+        x = &blk/[1,2,3];
     }
 }