From 5679f5c55e15e4a42542c36b1abc86b469903d19 Mon Sep 17 00:00:00 2001
From: Lindsey Kuper <lkuper@mozilla.com>
Date: Fri, 13 May 2011 17:26:14 -0700
Subject: 'with' no longer a token; whitespace police.

Plus renaming the anonymous objects test to a more descriptive name,
and XFAILing it because it doesn't work yet.
---
 src/test/run-pass/anon-objs.rs         | 33 +++++++++++++++++++++++++++++++++
 src/test/run-pass/method-overriding.rs | 32 --------------------------------
 2 files changed, 33 insertions(+), 32 deletions(-)
 create mode 100644 src/test/run-pass/anon-objs.rs
 delete mode 100644 src/test/run-pass/method-overriding.rs

(limited to 'src/test')

diff --git a/src/test/run-pass/anon-objs.rs b/src/test/run-pass/anon-objs.rs
new file mode 100644
index 00000000..14279db2
--- /dev/null
+++ b/src/test/run-pass/anon-objs.rs
@@ -0,0 +1,33 @@
+// xfail-boot
+// xfail-stage0
+// xfail-stage1
+use std;
+
+fn main() {
+
+    obj a() {
+        fn foo() -> int {
+            ret 2;
+        }
+        fn bar() -> int {
+            ret self.foo();
+        }
+    }
+
+    auto my_a = a();
+
+    // Extending an object with a new method
+    auto my_b = obj { 
+        fn baz() -> int { 
+            ret self.foo(); 
+        } 
+        with my_a 
+    };
+
+    // Extending an object with a new field
+    auto my_c = obj(int quux) { with my_a } ;
+
+    // Should this be legal?
+    auto my_d = obj() { with my_a } ;
+    
+}
diff --git a/src/test/run-pass/method-overriding.rs b/src/test/run-pass/method-overriding.rs
deleted file mode 100644
index c76123fe..00000000
--- a/src/test/run-pass/method-overriding.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// xfail-boot
-// xfail-stage0
-use std;
-
-fn main() {
-
-    obj a() {
-        fn foo() -> int {
-            ret 2;
-        }
-        fn bar() -> int {
-            ret self.foo();
-        }
-    }
-
-    auto my_a = a();
-
-    // Extending an object with a new method
-    auto my_b = obj { 
-        fn baz() -> int { 
-            ret self.foo(); 
-        } 
-        with my_a 
-    };
-
-    // Extending an object with a new field
-    auto my_c = obj(int quux) { with my_a } ;
-
-    // Should this be legal?
-    auto my_d = obj() { with my_a } ;
-    
-}
-- 
cgit v1.2.3