Actually notice xfail-stage2 as different from xfail-stage2. Fix affected tests.

Author: graydon

mk/tests.mk

@@ -57,8 +57,8 @@ TEST_RPASS_EXES_STAGE1 := \
   $(subst $(S)src/,,$(TEST_RPASS_CRATES_STAGE1:.rc=.stage1$(X))) \
   $(subst $(S)src/,,$(TEST_RPASS_SOURCES_STAGE1:.rs=.stage1$(X)))
 TEST_RPASS_EXES_STAGE2 := \
-  $(subst $(S)src/,,$(TEST_RPASS_CRATES_STAGE1:.rc=.stage2$(X))) \
-  $(subst $(S)src/,,$(TEST_RPASS_SOURCES_STAGE1:.rs=.stage2$(X)))
+  $(subst $(S)src/,,$(TEST_RPASS_CRATES_STAGE2:.rc=.stage2$(X))) \
+  $(subst $(S)src/,,$(TEST_RPASS_SOURCES_STAGE2:.rs=.stage2$(X)))
 
 TEST_RPASS_OUTS_STAGE0 := \
   $(TEST_RPASS_EXES_STAGE0:.stage0$(X)=.stage0.out)

src/test/run-pass/anon-obj-degenerate.rs

@@ -1,5 +1,6 @@
 //xfail-stage0
 //xfail-stage1
+//xfail-stage2
 use std;
 
 fn main() {

src/test/run-pass/anon-obj-overloading.rs

@@ -1,5 +1,6 @@
 //xfail-stage0
 //xfail-stage1
+//xfail-stage2
 use std;
 
 fn main() {
@@ -18,12 +19,12 @@ fn main() {
     // An anonymous object that overloads the 'foo' method.  Adding
     // support for this is issue #543 (making this work in the
     // presence of self-calls is the tricky part).
-    auto my_b = obj() { 
+    auto my_b = obj() {
         fn foo() -> int {
             ret 3;
         }
 
-        with my_a 
+        with my_a
     };
 
     assert (my_b.foo() == 3);

src/test/run-pass/anon-obj-with-self-call.rs

@@ -1,5 +1,6 @@
 //xfail-stage0
 //xfail-stage1
+//xfail-stage2
 use std;
 
 fn main() {
@@ -20,11 +21,11 @@ fn main() {
 
     // Right now, this fails with a failed lookup in a hashmap; not
     // sure where, but I think it might be during typeck.
-    auto my_b = obj { 
-        fn baz() -> int { 
-            ret self.foo(); 
-        } 
-        with my_a 
+    auto my_b = obj {
+        fn baz() -> int {
+            ret self.foo();
+        }
+        with my_a
     };
 
     assert (my_b.baz() == 2);

src/test/run-pass/anon-objs-with-fields.rs

@@ -1,5 +1,6 @@
 //xfail-stage0
 //xfail-stage1
+//xfail-stage2
 use std;
 
 fn main() {
@@ -23,7 +24,7 @@ fn main() {
         fn baz() -> int {
             ret quux + 4;
         }
-        with my_a 
+        with my_a
     };
 
     assert (my_c.baz() == 7);