Remove tests for objs, adjust tests that use objs

13 files changed, 3 insertions, 104 deletions

diff --git a/src/test/compile-fail/anon-obj-overriding-wrong-type.rs b/src/test/compile-fail/anon-obj-overriding-wrong-type.rs
deleted file mode 100644
index 764cb7bdb41..00000000000
--- a/src/test/compile-fail/anon-obj-overriding-wrong-type.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-//error-pattern: with one of a different type
-use std;
-
-fn main() {
-
-    obj a() {
-        fn foo() -> int { ret 2; }
-        fn bar() -> int { ret self.foo(); }
-    }
-
-    let my_a = a();
-
-    // Attempting to override a method with one of a different type.
-    let my_b =
-        obj () {
-            fn foo() -> str { ret "hello"; }
-            with
-            my_a
-        };
-
-    log(error, my_b.foo());
-}
diff --git a/src/test/compile-fail/bad-env-capture3.rs b/src/test/compile-fail/bad-env-capture3.rs
index 673a22ce11a..67a6221df01 100644
--- a/src/test/compile-fail/bad-env-capture3.rs
+++ b/src/test/compile-fail/bad-env-capture3.rs
@@ -1,5 +1,5 @@
 // error-pattern: attempted dynamic environment-capture
-obj foo(x: int) {
+fn foo(x: int) {
     fn mth() {
         fn bar() { log(debug, x); }
     }
diff --git a/src/test/compile-fail/bad-type-env-capture.rs b/src/test/compile-fail/bad-type-env-capture.rs
index 712d1466230..2a59af3fe80 100644
--- a/src/test/compile-fail/bad-type-env-capture.rs
+++ b/src/test/compile-fail/bad-type-env-capture.rs
@@ -1,6 +1,6 @@
 // xfail-test
 // error-pattern: attempted dynamic environment-capture
 fn foo<T>() {
-    obj bar(b: T) { }
+    fn bar(b: T) { }
 }
 fn main() { }
diff --git a/src/test/compile-fail/binop-sub-obj.rs b/src/test/compile-fail/binop-sub-obj.rs
deleted file mode 100644
index 630cd288a49..00000000000
--- a/src/test/compile-fail/binop-sub-obj.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-// error-pattern:- cannot be applied to type `obj
-
-fn main() { let x = obj () { } - obj () { }; }
diff --git a/src/test/compile-fail/constructor-as-cast.rs b/src/test/compile-fail/constructor-as-cast.rs
deleted file mode 100644
index 85d8c7850cf..00000000000
--- a/src/test/compile-fail/constructor-as-cast.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// error-pattern: unresolved name: base
-type base =
-    obj {
-        fn foo();
-    };
-obj derived() {
-    fn foo() { }
-    fn bar() { }
-}
-fn main() { let d: derived = derived(); let b: base = base(d); }
diff --git a/src/test/compile-fail/direct-obj-fn-call.rs b/src/test/compile-fail/direct-obj-fn-call.rs
deleted file mode 100644
index fc893dea438..00000000000
--- a/src/test/compile-fail/direct-obj-fn-call.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// error-pattern: attempted access of field hello
-
-obj x() {
-    fn hello() { #debug("hello"); }
-}
-
-fn main() { x.hello(); }
diff --git a/src/test/compile-fail/extend-non-object.rs b/src/test/compile-fail/extend-non-object.rs
deleted file mode 100644
index 0857ac990c0..00000000000
--- a/src/test/compile-fail/extend-non-object.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-//error-pattern:x does not have object type
-use std;
-
-fn main() {
-    let x = 3;
-
-    let anon_obj =
-        obj () {
-            fn foo() -> int { ret 3; }
-            with
-            x
-        };
-}
diff --git a/src/test/compile-fail/no-self-dispatch.rs b/src/test/compile-fail/no-self-dispatch.rs
deleted file mode 100644
index 876c668e8c6..00000000000
--- a/src/test/compile-fail/no-self-dispatch.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// error-pattern: unresolved name
-obj oT() {
-    fn get() -> int { ret 3; }
-    fn foo() { let c = get(); }
-}
-fn main() { }
diff --git a/src/test/compile-fail/not-a-pred-3.rs b/src/test/compile-fail/not-a-pred-3.rs
deleted file mode 100644
index 3ca98a5c1ce..00000000000
--- a/src/test/compile-fail/not-a-pred-3.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// -*- rust -*-
-
-// error-pattern: expected the constraint name
-
-obj f() {
-    fn g(q: int) -> bool { ret true; }
-}
-
-fn main() {
-    let z = f();
-    // should fail to typecheck, as z.g isn't an explicit name
-    check (z.g(42));
-}
diff --git a/src/test/compile-fail/not-a-pred.rs b/src/test/compile-fail/not-a-pred.rs
index 80e227ffb16..a7ccb475114 100644
--- a/src/test/compile-fail/not-a-pred.rs
+++ b/src/test/compile-fail/not-a-pred.rs
@@ -3,6 +3,6 @@
 
 fn f(a: int, b: int) : lt(a, b) { }
 
-obj lt(a: int, b: int) { }
+fn lt(a: int, b: int) { }
 
 fn main() { let a: int = 10; let b: int = 23; check (lt(a, b)); f(a, b); }
diff --git a/src/test/compile-fail/self-call-non-obj.rs b/src/test/compile-fail/self-call-non-obj.rs
deleted file mode 100644
index 8de59268482..00000000000
--- a/src/test/compile-fail/self-call-non-obj.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// error-pattern:unresolved name: self
-
-// Fix for issue #707.
-fn main() {
-
-    fn foo() -> int { ret 3(); }
-
-    self.foo();
-
-}
diff --git a/src/test/compile-fail/self-missing-method.rs b/src/test/compile-fail/self-missing-method.rs
deleted file mode 100644
index 21069a4832e..00000000000
--- a/src/test/compile-fail/self-missing-method.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-// error-pattern:attempted access of field m on type fn
-fn main() {
-
-  obj foo() {
-      fn m() {
-          self();
-      }
-  }
-
-  let a = foo;
-  a.m();
-}
diff --git a/src/test/compile-fail/writing-to-immutable-obj.rs b/src/test/compile-fail/writing-to-immutable-obj.rs
deleted file mode 100644
index 559e69275c7..00000000000
--- a/src/test/compile-fail/writing-to-immutable-obj.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-// error-pattern:assigning to immutable object field
-obj objy(x: int) {
-    fn foo() { x = 5; }
-}
-fn main() { }