Undid all commits between 22566 and 22597 included

in the 2.8.x branch, restoring the status to 2.8.0
final release, in preparation for 2.8.1.

82 files changed, 44 insertions, 1011 deletions

diff --git a/test/files/jvm/actor-executor2.scala b/test/files/jvm/actor-executor2.scala
index f8fcaef69f..da64a7fc43 100644
--- a/test/files/jvm/actor-executor2.scala
+++ b/test/files/jvm/actor-executor2.scala
@@ -1,6 +1,6 @@
 import scala.actors.{Actor, SchedulerAdapter, Exit}
 import Actor._
-import java.util.concurrent.{Executors, RejectedExecutionException}
+import java.util.concurrent.Executors
 
 object One extends AdaptedActor {
   def act() {
@@ -57,15 +57,9 @@ object Test {
   val scheduler =
     new SchedulerAdapter {
       def execute(block: => Unit) {
-        val task = new Runnable {
+        executor.execute(new Runnable {
           def run() { block }
-        }
-        try {
-          executor.execute(task)
-        } catch {
-          case ree: RejectedExecutionException =>
-            task.run() // run task on current thread
-        }
+        })
       }
     }
 
diff --git a/test/files/jvm/libnatives.jnilib b/test/files/jvm/libnatives.jnilib
index 1fc104883a..daac50e3df 100755..100644
--- a/test/files/jvm/libnatives.jnilib
+++ b/test/files/jvm/libnatives.jnilib
diff --git a/test/files/jvm/mkLibNatives.sh b/test/files/jvm/mkLibNatives.sh
index 537187eedd..ed80c24c3e 100755
--- a/test/files/jvm/mkLibNatives.sh
+++ b/test/files/jvm/mkLibNatives.sh
@@ -37,7 +37,7 @@ JAVAH_OPTIONS="-jni -force -classpath ${CLASS_DIR} -o ${OBJ_NAME}.h"
 CC=gcc
 
 if $darwin; then
-  CC_OPTIONS="-c -arch ppc -arch i386 -arch x86_64"
+  CC_OPTIONS="-c -arch ppc -arch i386"
   CC_INCLUDES="-I/System/Library/Frameworks/JavaVM.framework/Headers"
   LNK_OPTIONS="-dynamiclib -framework JavaVM"
   FULL_LIB_NAME=${LIB_NAME}.jnilib
diff --git a/test/files/neg/abstract-vars.check b/test/files/neg/abstract-vars.check
deleted file mode 100644
index 8aa47745f6..0000000000
--- a/test/files/neg/abstract-vars.check
+++ /dev/null
@@ -1,21 +0,0 @@
-abstract-vars.scala:5: error: class Fail1 needs to be abstract, since variable x is not defined
-(Note that variables need to be initialized to be defined)
-class Fail1 extends A {
-      ^
-abstract-vars.scala:9: error: class Fail2 needs to be abstract, since variable x in class A of type Int is not defined
-(Note that variables need to be initialized to be defined)
-class Fail2 extends A { }
-      ^
-abstract-vars.scala:11: error: class Fail3 needs to be abstract, since variable x in class A of type Int is not defined
-(Note that an abstract var requires a setter in addition to the getter)
-class Fail3 extends A {
-      ^
-abstract-vars.scala:14: error: class Fail4 needs to be abstract, since variable x in class A of type Int is not defined
-(Note that an abstract var requires a setter in addition to the getter)
-class Fail4 extends A {
-      ^
-abstract-vars.scala:18: error: class Fail5 needs to be abstract, since variable x in class A of type Int is not defined
-(Note that an abstract var requires a getter in addition to the setter)
-class Fail5 extends A {
-      ^
-5 errors found
diff --git a/test/files/neg/abstract-vars.scala b/test/files/neg/abstract-vars.scala
deleted file mode 100644
index df6109d3a8..0000000000
--- a/test/files/neg/abstract-vars.scala
+++ /dev/null
@@ -1,29 +0,0 @@
-abstract class A {
-  var x: Int
-}
-
-class Fail1 extends A {
-  var x: Int
-}
-
-class Fail2 extends A { }
-
-class Fail3 extends A {
-  val x: Int = 5
-}
-class Fail4 extends A {
-  def x: Int = 5
-}
-
-class Fail5 extends A {
-  def x_=(y: Int) = ()
-}
-
-class Success1 extends A {
-  val x: Int = 5
-  def x_=(y: Int) = ()
-}
-
-class Success2 extends A {
-  var x: Int = 5
-}
diff --git a/test/files/neg/bug1275.check b/test/files/neg/bug1275.check
index 40c5d79d27..9f806c0689 100644
--- a/test/files/neg/bug1275.check
+++ b/test/files/neg/bug1275.check
@@ -1,6 +1,4 @@
-bug1275.scala:8: error: type mismatch;
- found   : xs.MyType[a]
- required: s
-    = xs f // xs: s <: Seq[a]{type MyType <: s }
-         ^
+bug1275.scala:13: error: The kind of type MyType does not conform to the expected kind of type MyType[+t] <: TestCovariance.Seq[t] in trait Seq.
+    def span[a, s <: Seq[a] { type MyType <: s } ](xs: s): s = xs f
+                                   ^
 one error found
diff --git a/test/files/neg/bug1275.scala b/test/files/neg/bug1275.scala
index 769156fff2..e9be13c763 100644
--- a/test/files/neg/bug1275.scala
+++ b/test/files/neg/bug1275.scala
@@ -1,12 +1,14 @@
-object Test {
-  trait Seq[+t] {
-    type MyType[+t] <: Seq[t]
-    def f: MyType[t]
-  }
-
-  def span[a, s <: Seq[a] { type MyType <: s } ](xs: s): s
-    = xs f // xs: s <: Seq[a]{type MyType <: s }
-    // xs.f : xs.MyType[a] <: Seq[a]
-    // ill-formed type in bound for s: Seq[a] { type MyType <: s }
-    // refinements aren't checked -- should they?
-}
\ No newline at end of file
+// tested using Scala compiler version 2.6.0-RC1 -- (c) 2002-2010 LAMP/EPFL
+
+// prompted by "Covariant return types" mailing list question
+object TestCovariance {
+
+    // see  Type constructor polymorphism  in  http://www.scala-lang.org/docu/changelog.html
+    trait Seq[+t] {
+        type MyType[+t] <: Seq[t]
+
+        def f: MyType[t]
+    }
+
+    def span[a, s <: Seq[a] { type MyType <: s } ](xs: s): s = xs f
+}
diff --git a/test/files/neg/bug1845.check b/test/files/neg/bug1845.check
deleted file mode 100644
index 164f3f60c1..0000000000
--- a/test/files/neg/bug1845.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug1845.scala:9: error: illegal cyclic reference involving value <import>
-  val lexical = new StdLexical
-                    ^
-one error found
diff --git a/test/files/neg/bug1845.scala b/test/files/neg/bug1845.scala
deleted file mode 100644
index ceb43a0552..0000000000
--- a/test/files/neg/bug1845.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-import scala.util.parsing.combinator.syntactical.TokenParsers
-import scala.util.parsing.combinator.lexical.StdLexical
-import scala.util.parsing.syntax.StdTokens
-
-class MyTokenParsers extends TokenParsers {
-  import lexical._
-  type Tokens = StdTokens
-  type Elem = lexical.Token
-  val lexical = new StdLexical
-}
diff --git a/test/files/neg/bug3209.check b/test/files/neg/bug3209.check
deleted file mode 100644
index fa50f4ce1d..0000000000
--- a/test/files/neg/bug3209.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug3209.scala:2: error: expected start of definition
-package test
-^
-one error found
diff --git a/test/files/neg/bug3209.scala b/test/files/neg/bug3209.scala
deleted file mode 100644
index d893726659..0000000000
--- a/test/files/neg/bug3209.scala
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.annotation.Generated(Array("test"))
-package test
\ No newline at end of file
diff --git a/test/files/neg/bug3631.check b/test/files/neg/bug3631.check
deleted file mode 100644
index 12d94aa4dc..0000000000
--- a/test/files/neg/bug3631.check
+++ /dev/null
@@ -1,4 +0,0 @@
-bug3631.scala:3: error: Implementation restriction: case classes cannot have more than 22 parameters.
-case class X23(x1: Int, x2: Int, x3: Int, x4: Int, x5: Int, x6: Int, x7: Int, x8: Int, x9: Int, x10: Int, x11: Int, x12: Int, x13: Int, x14: Int, x15: Int, x16: Int, x17: Int, x18: Int, x19: Int, x20: Int, x21: Int, x22: Int, x23: Int) { }
-           ^
-one error found
diff --git a/test/files/neg/bug3631.scala b/test/files/neg/bug3631.scala
deleted file mode 100644
index bcf91619ee..0000000000
--- a/test/files/neg/bug3631.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-case class X22(x1: Int, x2: Int, x3: Int, x4: Int, x5: Int, x6: Int, x7: Int, x8: Int, x9: Int, x10: Int, x11: Int, x12: Int, x13: Int, x14: Int, x15: Int, x16: Int, x17: Int, x18: Int, x19: Int, x20: Int, x21: Int, x22: Int) { }
-
-case class X23(x1: Int, x2: Int, x3: Int, x4: Int, x5: Int, x6: Int, x7: Int, x8: Int, x9: Int, x10: Int, x11: Int, x12: Int, x13: Int, x14: Int, x15: Int, x16: Int, x17: Int, x18: Int, x19: Int, x20: Int, x21: Int, x22: Int, x23: Int) { }
\ No newline at end of file
diff --git a/test/files/neg/bug882.check b/test/files/neg/bug882.check
index 4e3e6d0860..8f47fefd9b 100644
--- a/test/files/neg/bug882.check
+++ b/test/files/neg/bug882.check
@@ -1,4 +1,4 @@
-bug882.scala:2: error: traits cannot have type parameters with context bounds `: ...' nor view bounds `<% ...'
+bug882.scala:2: error: traits cannot have type parameters with context bounds `: ...'
 trait SortedSet[A <% Ordered[A]] {
                                  ^
 one error found
diff --git a/test/files/neg/names-defaults-neg.check b/test/files/neg/names-defaults-neg.check
index b2b00b7050..38bacc0888 100644
--- a/test/files/neg/names-defaults-neg.check
+++ b/test/files/neg/names-defaults-neg.check
@@ -104,20 +104,17 @@ names-defaults-neg.scala:82: error: type mismatch;
 Error occurred in an application involving default arguments.
   new A2[String]()
   ^
-names-defaults-neg.scala:86: error: module extending its companion class cannot use default constructor arguments
-    object C extends C()
-             ^
-names-defaults-neg.scala:120: error: reference to var2 is ambiguous; it is both, a parameter
+names-defaults-neg.scala:115: error: reference to var2 is ambiguous; it is both, a parameter
 name of the method and the name of a variable currently in scope.
   delay(var2 = 40)
              ^
-names-defaults-neg.scala:123: error: missing parameter type for expanded function ((x$1) => a = x$1)
+names-defaults-neg.scala:118: error: missing parameter type for expanded function ((x$1) => a = x$1)
   val taf2: Int => Unit = testAnnFun(a = _, b = get("+"))
                                          ^
-names-defaults-neg.scala:124: error: parameter specified twice: a
+names-defaults-neg.scala:119: error: parameter specified twice: a
   val taf3 = testAnnFun(b = _: String, a = get(8))
                                          ^
-names-defaults-neg.scala:125: error: wrong number of parameters; expected = 2
+names-defaults-neg.scala:120: error: wrong number of parameters; expected = 2
   val taf4: (Int, String) => Unit = testAnnFun(_, b = _)
                                               ^
-29 errors found
+28 errors found
diff --git a/test/files/neg/names-defaults-neg.scala b/test/files/neg/names-defaults-neg.scala
index 43883540a0..e73dc71c9b 100644
--- a/test/files/neg/names-defaults-neg.scala
+++ b/test/files/neg/names-defaults-neg.scala
@@ -81,11 +81,6 @@ object Test extends Application {
   // correct error message
   new A2[String]()
 
-  object t3648 {
-    class C(val s: String = "")
-    object C extends C()
-  }
-
   // DEFINITIONS
   def test1(a: Int, b: String) = a +": "+ b
   def test2(x: Unit) = println("test2")
diff --git a/test/files/neg/t2416.check b/test/files/neg/t2416.check
deleted file mode 100644
index 0899ad09d5..0000000000
--- a/test/files/neg/t2416.check
+++ /dev/null
@@ -1,10 +0,0 @@
-t2416.scala:3: error: type arguments [Int] do not conform to trait A's type parameter bounds [X <: Double]
-  def x : A[Int]#B = 10 // no you won't
-          ^
-t2416.scala:8: error: type arguments [Boolean] do not conform to type B's type parameter bounds [Y <: Double]
-  def x : A#B[Boolean] = 10 // seriously?
-            ^
-t2416.scala:13: error: type arguments [String] do not conform to type B's type parameter bounds [Z <: Double]
-  type C[Z <: A] = Z#B[String] // nuh-uh!
-                     ^
-three errors found
diff --git a/test/files/neg/t2416.scala b/test/files/neg/t2416.scala
deleted file mode 100644
index 6bb57a984b..0000000000
--- a/test/files/neg/t2416.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-object t2416a {
-  trait A[X <: Double] { type B = X }
-  def x : A[Int]#B = 10 // no you won't
-}
-
-object t2416b {
-  trait A{type B[Y <: Double] = Int}
-  def x : A#B[Boolean] = 10 // seriously?
-}
-
-object t2416c {
-  trait A{type B[Z <: Double] = Int}
-  type C[Z <: A] = Z#B[String] // nuh-uh!
-}
\ No newline at end of file
diff --git a/test/files/neg/t3399.check b/test/files/neg/t3399.check
deleted file mode 100644
index eb6c679704..0000000000
--- a/test/files/neg/t3399.check
+++ /dev/null
@@ -1,4 +0,0 @@
-t3399.scala:23: error: could not find implicit value for parameter e: =:=[Nats.Add[Nats._1,Nats._1],Nats._1]
-    implicitly[ Add[_1, _1] =:= _1]
-              ^
-one error found
diff --git a/test/files/neg/t3399.scala b/test/files/neg/t3399.scala
deleted file mode 100644
index 3edaa0724f..0000000000
--- a/test/files/neg/t3399.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-object Nats {
-    sealed trait Nat {
-        // fold right on N, N-1, ..., 1
-        type FoldR[Init <: Type, Type, F <: Fold[Nat, Type]] <: Type
-    }
-    sealed trait _0 extends Nat {
-        type FoldR[Init <: Type, Type, F <: Fold[Nat, Type]] = Init
-    }
-    sealed trait Succ[N <: Nat] extends Nat {
-        type FoldR[Init <: Type, Type, F <: Fold[Nat, Type]] =
-          F#Apply[Succ[N], N#FoldR[Init, Type, F]]
-    }
-
-    type Add[A <: Nat, B <: Nat] = A#FoldR[B, Nat, Inc]
-    trait Fold[-Elem, Value] {
-        type Apply[N <: Elem, Acc <: Value] <: Value
-    }
-    type Inc = Fold[Any, Nat] {
-        type Apply[N <: Any, Acc <: Nat] = Succ[Acc]
-    }
-
-    type _1 = Succ[_0]
-    implicitly[ Add[_1, _1] =:= _1]
-}
\ No newline at end of file
diff --git a/test/files/neg/t3507.check b/test/files/neg/t3507.check
deleted file mode 100644
index 1246a20d09..0000000000
--- a/test/files/neg/t3507.check
+++ /dev/null
@@ -1,4 +0,0 @@
-t3507.scala:13: error: could not find implicit value for evidence parameter of type Manifest[object _1.b.c]
-  mani/*[object _1.b.c]*/(c) // kaboom in manifestOfType / TreeGen.mkAttributedQualifier
-                         ^
-one error found
diff --git a/test/files/neg/t3507.scala b/test/files/neg/t3507.scala
deleted file mode 100644
index 9a8c7c5462..0000000000
--- a/test/files/neg/t3507.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-class A {
-  object b {
-    object c
-  }
-  def m = b.c
-}
-
-object Test {
-  var a: A = new A // mutable
-  val c /*: object _1.b.c forSome { val _1: A } */ = a.m // widening using existential
-
-  def mani[T: Manifest](x: T) = ()
-  mani/*[object _1.b.c]*/(c) // kaboom in manifestOfType / TreeGen.mkAttributedQualifier
-  // --> _1 is not in scope here
-}
\ No newline at end of file
diff --git a/test/files/neg/t3604.check b/test/files/neg/t3604.check
deleted file mode 100644
index b07c5c9c71..0000000000
--- a/test/files/neg/t3604.check
+++ /dev/null
@@ -1,7 +0,0 @@
-t3604.scala:3: error: in XML literal: expected closing tag of abbr
-    <abbr></div>
-               ^
-t3604.scala:3: error: start tag was here: abbr>
-    <abbr></div>
-     ^
-two errors found
diff --git a/test/files/neg/t3604.scala b/test/files/neg/t3604.scala
deleted file mode 100644
index f890a58e58..0000000000
--- a/test/files/neg/t3604.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-object Main {
-  <div>
-    <abbr></div>
-    { "..." }
-  </div>
-}
diff --git a/test/files/neg/t3653.check b/test/files/neg/t3653.check
deleted file mode 100644
index ac6e2ca9dc..0000000000
--- a/test/files/neg/t3653.check
+++ /dev/null
@@ -1,7 +0,0 @@
-t3653.scala:3: error: double definition:
-method x:(implicit x: Int)Int and
-method x:(i: Int)Int at line 2
-have same type after erasure: (x: Int)Int
-   def x(implicit x: Int) = 5
-       ^
-one error found
diff --git a/test/files/neg/t3653.scala b/test/files/neg/t3653.scala
deleted file mode 100644
index 96cf96008a..0000000000
--- a/test/files/neg/t3653.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-class B {
-   def x(i: Int) = 3
-   def x(implicit x: Int) = 5
-}
\ No newline at end of file
diff --git a/test/files/neg/t742.check b/test/files/neg/t742.check
deleted file mode 100644
index f587948ef1..0000000000
--- a/test/files/neg/t742.check
+++ /dev/null
@@ -1,5 +0,0 @@
-t742.scala:5: error: kinds of the type arguments (Crash._1,Crash._2,Any) do not conform to the expected kinds of the type parameters (type m,type n,type z).
-Crash._1's type parameters do not match type m's expected parameters: type s1 has one type parameter, but type n has two
-    type p = mul[_1, _2, Any]  // mul[_1, _1, Any] needs -Yrecursion
-             ^
-one error found
diff --git a/test/files/neg/t742.scala b/test/files/neg/t742.scala
deleted file mode 100644
index bb1c2f85ea..0000000000
--- a/test/files/neg/t742.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-object Crash {
-    type mul[m[n[s[_], z], z], n[s[_], z], z] = m[n, z]
-    type _1[s1[_], z1] = s1[z1]
-    type _2[s1[_], z1] = s1[z1]
-    type p = mul[_1, _2, Any]  // mul[_1, _1, Any] needs -Yrecursion
-    // _1[_2, Zero]
-    // _2[Zero]
-}
\ No newline at end of file
diff --git a/test/files/neg/tailrec-2.check b/test/files/neg/tailrec-2.check
deleted file mode 100644
index ab6733946d..0000000000
--- a/test/files/neg/tailrec-2.check
+++ /dev/null
@@ -1,4 +0,0 @@
-tailrec-2.scala:6: error: could not optimize @tailrec annotated method: it contains a recursive call targetting a supertype
-  @annotation.tailrec final def f[B >: A](mem: List[B]): List[B] = (null: Super[A]).f(mem)
-                                ^
-one error found
diff --git a/test/files/neg/tailrec-2.scala b/test/files/neg/tailrec-2.scala
deleted file mode 100644
index 4388815a06..0000000000
--- a/test/files/neg/tailrec-2.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-sealed abstract class Super[+A] {
-  def f[B >: A](mem: List[B]) : List[B]
-}
-// This one should fail, target is a supertype
-class Bop1[+A](val element: A) extends Super[A] {
-  @annotation.tailrec final def f[B >: A](mem: List[B]): List[B] = (null: Super[A]).f(mem)
-}
-// These succeed
-class Bop2[+A](val element: A) extends Super[A] {
-  @annotation.tailrec final def f[B >: A](mem: List[B]): List[B] = (null: Bop2[A]).f(mem)
-}
-object Bop3 extends Super[Nothing] {
-  @annotation.tailrec final def f[B](mem: List[B]): List[B] = (null: Bop3.type).f(mem)
-}
-class Bop4[+A](val element: A) extends Super[A] {
-  @annotation.tailrec final def f[B >: A](mem: List[B]): List[B] = Other.f[A].f(mem)
-}
-
-object Other {
-  def f[T] : Bop4[T] = error("")
-}
-
-object Bop {
-  def m1[A] : Super[A] = error("")
-  def m2[A] : Bop2[A] = error("")
-}
\ No newline at end of file
diff --git a/test/files/pos/bug0013.scala b/test/files/pos/bug0013.scala
deleted file mode 100644
index 999a2ab61c..0000000000
--- a/test/files/pos/bug0013.scala
+++ /dev/null
@@ -1,31 +0,0 @@
-// covariant linked list
-abstract class M { self =>
-
-    type T
-    final type selfType = M {type T <: self.T}
-    type actualSelfType >: self.type <: selfType
-
-    def next: selfType
-
-    // I don't understand why this doesn't compile, but that's a separate matter
-    // error: method all2 cannot be accessed in M.this.selfType
-    // because its instance type => Stream[M{type T <: M.this.selfType#T}]
-    // contains a malformed type: M.this.selfType#T
-    // def all2: Stream[M {type T <: self.T}] = Stream.cons(self: actualSelfType, next.all2)
-
-
-    // compiles successfully
-    // def all3: Stream[M {type T <: self.T}] = all3Impl(self: actualSelfType)
-    // private def all3Impl(first: M {type T <: self.T}): Stream[M {type T <: self.T}] = Stream.cons(first, all3Impl(first.next))
-
-
-
-    def all4: Stream[M {type T <: self.T}] = Unrelated.all4Impl[T](self: actualSelfType)
-}
-
-object Unrelated {
-    def all4Impl[U](first: M {type T <: U}): Stream[M {type T <: U}] = Stream.cons(first, all4Impl(first.next))
-
-    // compiles successfully
-    // def all4Impl[U](first: M {type T <: U}): Stream[M {type T <: U}] = Stream.cons(first, all4Impl[U](first.next))
-}
\ No newline at end of file
diff --git a/test/files/pos/bug0095.scala b/test/files/pos/bug0095.scala
deleted file mode 100644
index 71386cf5c7..0000000000
--- a/test/files/pos/bug0095.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-class ParseResult[+T]
-case class Success[+T](t: T) extends ParseResult[T]
-
-abstract class Nonterminal[Output] {
-
-  type SubNonterminal = Nonterminal[T] forSome { type T <: Output }
-
-  def parse: ParseResult[Output]
-
-  def parse1(nts: List[SubNonterminal]): ParseResult[Output] =
-    nts match {
-      case nt::nts => nt.parse match { case Success(so) => Success(so) }
-      case Nil => throw new Error
-    }
-}
diff --git a/test/files/pos/bug1974.scala b/test/files/pos/bug1974.scala
deleted file mode 100644
index a0daa13c21..0000000000
--- a/test/files/pos/bug1974.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-object Broken {
-  private var map = Map[Class[_], String]()
-
-  def addToMap(c : Class[_], s : String) = map += (c -> s)
-  def fetch(c : Class[_]) = map(c)
-}
-
-object Works {
-  private var map = Map[Class[_], String]()
-
-  def addToMap(c : Class[_], s : String) = map += ((c, s))
-  def fetch(c : Class[_]) = map(c)
-}
-
-object Works2 {
-  private var map = Map[Class[_], String]()
-
-  def addToMap(c : Class[_], s : String) = map += ((c : Class[_]) -> s)
-  def fetch(c : Class[_]) = map(c)
-}
\ No newline at end of file
diff --git a/test/files/pos/bug261-ab.scala b/test/files/pos/bug261-ab.scala
deleted file mode 100644
index 80699e692c..0000000000
--- a/test/files/pos/bug261-ab.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-trait A { val foo: String = "A" }
-trait B {
-  private val foo: String = "B"
-  def f = println(foo)
-}
-object Test extends Application with B with A {
-  println(foo) // prints "A", as expected
-  f            // prints "B", as expected
-}
\ No newline at end of file
diff --git a/test/files/pos/bug261-ba.scala b/test/files/pos/bug261-ba.scala
deleted file mode 100644
index c66a68d101..0000000000
--- a/test/files/pos/bug261-ba.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-trait B {
-  private val foo: String = "B"
-  def f = println(foo)
-}
-trait A { val foo: String = "A" }
-object Test extends Application with B with A {
-  println(foo) // prints "A", as expected
-  f            // prints "B", as expected
-}
\ No newline at end of file
diff --git a/test/files/pos/bug3234.flags b/test/files/pos/bug3234.flags
deleted file mode 100644
index c9cefdc4b9..0000000000
--- a/test/files/pos/bug3234.flags
+++ /dev/null
@@ -1 +0,0 @@
--Yinline -Xfatal-warnings
\ No newline at end of file
diff --git a/test/files/pos/bug3234.scala b/test/files/pos/bug3234.scala
deleted file mode 100644
index 1553f1fa05..0000000000
--- a/test/files/pos/bug3234.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-trait Trait1 {
-  // need more work before this one works
-  // @inline
-  def foo2(n: Int) = n*n
-}
-
-trait Trait2 {
-  @inline def foo3(n: Int) = 1
-}
-
-class Base extends Trait1 {
-  @inline def foo(n: Int) = n
-}
-
-object Test extends Base with Trait2 {
-  def main(args: Array[String]) = {
-    println(foo(42) + foo2(11) + foo3(2))
-  }
-}
\ No newline at end of file
diff --git a/test/files/pos/bug3440.scala b/test/files/pos/bug3440.scala
deleted file mode 100644
index 026abfea1f..0000000000
--- a/test/files/pos/bug3440.scala
+++ /dev/null
@@ -1,18 +0,0 @@
-object test {
-  abstract class SampleFormat1 {
-    def readerFactory: Any
-  }
-
-  case object Int8 extends SampleFormat1 {
-    def readerFactory = error("")
-  }
-  case object Int16 extends SampleFormat1 {
-    def readerFactory = error("")
-  }
-
-  (new {}: Any) match {
-   case 8   => Int8
-   case 16  => Int16
-   case _   => error("")
-  }
-}
\ No newline at end of file
diff --git a/test/files/pos/bug3521/DoubleValue.java b/test/files/pos/bug3521/DoubleValue.java
deleted file mode 100644
index e8c093890b..0000000000
--- a/test/files/pos/bug3521/DoubleValue.java
+++ /dev/null
@@ -1,7 +0,0 @@
-import java.lang.annotation.*;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface DoubleValue {
-  double value();
-}
\ No newline at end of file
diff --git a/test/files/pos/bug3521/a.scala b/test/files/pos/bug3521/a.scala
deleted file mode 100644
index 94bb451fc3..0000000000
--- a/test/files/pos/bug3521/a.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-class Test {
-  @DoubleValue(-0.05)
-  var a = 0
-}
\ No newline at end of file
diff --git a/test/files/pos/bug3570.scala b/test/files/pos/bug3570.scala
deleted file mode 100644
index 8921f83b2a..0000000000
--- a/test/files/pos/bug3570.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-class test {
-	object Break extends Throwable
-	def break = throw Break
-	def block(x: => Unit) {
-		try { x } catch { case e: Break.type => }
-	}
-}
diff --git a/test/files/pos/t1263/Test.java b/test/files/pos/t1263/Test.java
index 6ca88c21a1..0eb43e881a 100644
--- a/test/files/pos/t1263/Test.java
+++ b/test/files/pos/t1263/Test.java
@@ -5,7 +5,7 @@ import java.rmi.RemoteException;
 import test.Map;
 
 public class Test implements Map<String, String> {
-  public Map.MapTo plus(String o) {
+  public Map<String, String>.MapTo plus(String o) {
     return null;
   }
 
diff --git a/test/files/pos/t2133.scala b/test/files/pos/t2133.scala
deleted file mode 100644
index c74d0a4bbf..0000000000
--- a/test/files/pos/t2133.scala
+++ /dev/null
@@ -1,18 +0,0 @@
-trait Foo {
-  object bar {
-    private[this] def fn() = 5
-  }
-}
-
-trait Foo2 {
-  object bip {
-    def fn() = 10
-  }
-}
-
-class Bob extends AnyRef with Foo with Foo2 {
-  import bip._
-  import bar._
-
-  def go() = fn()
-}
diff --git a/test/files/pos/t2331.scala b/test/files/pos/t2331.scala
deleted file mode 100644
index 9a15b5c2a9..0000000000
--- a/test/files/pos/t2331.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-trait C {
-  def m[T]: T
-}
-
-object Test {
-  val o /*: C --> no crash*/ = new C {
-    def m[T]: Nothing /*: T --> no crash*/ = error("omitted")
-  }
-
-  o.m[Nothing]
-}
\ No newline at end of file
diff --git a/test/files/pos/t2413/TestJava.java b/test/files/pos/t2413/TestJava.java
deleted file mode 100644
index 252c01fbc0..0000000000
--- a/test/files/pos/t2413/TestJava.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package pack;
-
-public class TestJava {
-    protected String repeatParam(String ... items) {
-        return "nothing";
-    }
-}
diff --git a/test/files/pos/t2413/TestScalac.scala b/test/files/pos/t2413/TestScalac.scala
deleted file mode 100644
index 098e852dd7..0000000000
--- a/test/files/pos/t2413/TestScalac.scala
+++ /dev/null
@@ -1,23 +0,0 @@
-import pack.TestJava
-
-class Foo extends TestJava {
-
-   // THIS METHOD YIELDS TO CRASH
-/*   def foomethod : Option[String] => Unit = {
-      case None =>
-        val path = repeatParam("s","a","b","c")
-        ()
-      case Some(error) =>
-        ()
-   }
-
-  // THIS IS OK
-  def foomethod2 : String = repeatParam("s","a");
-
-  // THIS IS OK
-  val aVal = repeatParam("1","2","3") */
-
-  // THIS YIELDS TO CRASH
-  for (a <- 1 to 4 ; anotherVal = repeatParam("1","2","3"))
-    yield anotherVal
-}
diff --git a/test/files/pos/t3174.scala b/test/files/pos/t3174.scala
deleted file mode 100755
index c3d90a4946..0000000000
--- a/test/files/pos/t3174.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-object test {
-  def method() {
-    class Foo extends AnyRef {
-      object Color {
-        object Blue
-      }
-
-      class Board {
-        val grid = Color.Blue
-      }
-    }
-    new Foo
-  }
- }
diff --git a/test/files/pos/t3174b.scala b/test/files/pos/t3174b.scala
deleted file mode 100755
index 4df1bfe837..0000000000
--- a/test/files/pos/t3174b.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-trait Foo[X] { def foo : Map[String,Foo[X]] }
-
-object Test {
-  def f[T]() : Foo[T] = {
-    class Anon extends Foo[T] {
-      var foo: Map[String, Foo[T]] = Map[String,Foo[T]]()
-      //def foo = Map[String,Foo[T]]()
-      //def foo_=(x: Map[String,Foo[T]]) {}
-    }
-    new Anon
-  }
-}
diff --git a/test/files/pos/t3249/Test.java b/test/files/pos/t3249/Test.java
deleted file mode 100644
index 4cc7cb2ab5..0000000000
--- a/test/files/pos/t3249/Test.java
+++ /dev/null
@@ -1,5 +0,0 @@
-public class Test {
-  public static void meh() {
-    new A<Integer>().f();
-  }
-}
\ No newline at end of file
diff --git a/test/files/pos/t3249/a.scala b/test/files/pos/t3249/a.scala
deleted file mode 100644
index 0394464549..0000000000
--- a/test/files/pos/t3249/a.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-class A[U] { def f[T] = { class X extends A[T] } }
-
-
-/*
-$ scalac a.scala
-$ javac -cp .:$SCALA_HOME/lib/scala-library.jar  -Xprint 'A$X$1'
-
-  public class X$1 extends A<java.lang.Object> implements scala.ScalaObject {
-    public X$1(A<U> null);
-  }
-*/
\ No newline at end of file
diff --git a/test/files/pos/t3374.scala b/test/files/pos/t3374.scala
deleted file mode 100644
index 4c0293181d..0000000000
--- a/test/files/pos/t3374.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-trait Parent {
- type Test[A, H[B <: A]]
-}
-trait Sub extends Parent {
- type Test[AS, HS[B <: AS]] = AS
-}
\ No newline at end of file
diff --git a/test/files/pos/t3477.scala b/test/files/pos/t3477.scala
deleted file mode 100644
index 660aa55736..0000000000
--- a/test/files/pos/t3477.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-class J3 {
-  def f[K, K1 >: K, V](x: Map[K1, V]): Map[K, V] = error("")
-}
-
-object Test {
-  (new J3).f(Map[Int, Int]())
-}
\ No newline at end of file
diff --git a/test/files/pos/t3486/JTest.java b/test/files/pos/t3486/JTest.java
deleted file mode 100644
index 0bf388b72d..0000000000
--- a/test/files/pos/t3486/JTest.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public class JTest<A> extends T2<A> {
-  public A m( A a ) { return a; }
-}
\ No newline at end of file
diff --git a/test/files/pos/t3486/test.scala b/test/files/pos/t3486/test.scala
deleted file mode 100644
index 544232b0d1..0000000000
--- a/test/files/pos/t3486/test.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-trait Test[A] {
-  def m( a: A ): A
-  def specified(a:A):A = a
-}
-
-abstract class T2[A] extends Test[A]
\ No newline at end of file
diff --git a/test/files/pos/t3494.scala b/test/files/pos/t3494.scala
deleted file mode 100644
index 35a4bcde5d..0000000000
--- a/test/files/pos/t3494.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-object Test {
-  def f[T](xs: T*) = ()
-
-  val x = "abc"
-
-  f[x.type](x)
-}
\ No newline at end of file
diff --git a/test/files/pos/t3568.scala b/test/files/pos/t3568.scala
deleted file mode 100755
index c8e3fcc4be..0000000000
--- a/test/files/pos/t3568.scala
+++ /dev/null
@@ -1,46 +0,0 @@
-import scala.annotation._
-import scala.annotation.unchecked._
-import scala.collection._
-
-
-package object buffer {
-  val broken = new ArrayVec2() // commenting out this line causes the file to compile.
-
-  val works = Class.forName("buffer.ArrayVec2").newInstance().asInstanceOf[ArrayVec2]
-}
-
-package buffer {
-  object Main {
-    // ArrayVec2 can be compiled, instantiated and used.
-    def main(args: Array[String]) { println(works) }
-  }
-
-  trait ElemType { type Element; type Component <: ElemType }
-  trait Float1 extends ElemType { type Element = Float; type Component = Float1}
-  class Vec2 extends ElemType { type Element = Vec2;  type Component = Float1 }
-
-  abstract class BaseSeq[T <: ElemType, E]
-  extends IndexedSeq[E] with IndexedSeqOptimized[E, IndexedSeq[E]] {
-    def length = 1
-    def apply(i: Int) :E
-  }
-
-  abstract class GenericSeq[T <: ElemType] extends BaseSeq[T, T#Element]
-  trait DataArray[T <: ElemType] extends BaseSeq[T, T#Element]
-  trait DataView[T <: ElemType] extends BaseSeq[T, T#Element]
-  abstract class BaseFloat1 extends BaseSeq[Float1, Float]
-
-  class ArrayFloat1 extends BaseFloat1 with DataArray[Float1] {
-    def apply(i: Int) :Float = 0f
-  }
-
-  class ViewFloat1 extends BaseFloat1 with DataView[Float1] {
-    def apply(i: Int) :Float = 0f
-  }
-
-  class ArrayVec2(val backingSeq: ArrayFloat1)
-  extends GenericSeq[Vec2] with DataArray[Vec2] {
-    def this() = this(new ArrayFloat1)
-    def apply(i: Int) :Vec2 = null
-  }
-}
diff --git a/test/files/pos/t3622/test/AsyncTask.java b/test/files/pos/t3622/test/AsyncTask.java
deleted file mode 100644
index cfcea3fe1a..0000000000
--- a/test/files/pos/t3622/test/AsyncTask.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package test;
-
-public abstract class AsyncTask<Params, Progress, Result> {
-    protected abstract Result doInBackground(Params... args);
-}
\ No newline at end of file
diff --git a/test/files/pos/t3622/test/MyAsyncTask.java b/test/files/pos/t3622/test/MyAsyncTask.java
deleted file mode 100644
index 9ef4947052..0000000000
--- a/test/files/pos/t3622/test/MyAsyncTask.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package test;
-
-public abstract class MyAsyncTask extends AsyncTask<String, String, String> {
-    protected abstract String doInBackground1(String[] args);
-    @Override
-    protected String doInBackground(String... args) {
-        return doInBackground1(new String[]{"dummy"});
-    }
-}
\ No newline at end of file
diff --git a/test/files/pos/t3622/test/Test.scala b/test/files/pos/t3622/test/Test.scala
deleted file mode 100644
index fb82c581f9..0000000000
--- a/test/files/pos/t3622/test/Test.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-package test
-
-class Test extends MyAsyncTask {
-  protected[test] def doInBackground1(args: Array[String]): String = ""
-}
\ No newline at end of file
diff --git a/test/files/run/bitsets-msil.check b/test/files/run/bitsets-msil.check
index b187571bff..9fefa3125e 100644
--- a/test/files/run/bitsets-msil.check
+++ b/test/files/run/bitsets-msil.check
@@ -1,23 +1,23 @@
-ms0 = BitSet(2)
-ms1 = BitSet(2)
-ms2 = BitSet(2)
+ms0 = Set(2)
+ms1 = Set(2)
+ms2 = Set(2)
 mb0 = False
 mb1 = True
 mb2 = False
 xs0 = List(2)
 xs1 = List(2)
 xs2 = List(2)
-ma0 = List(2)
-ma1 = List(2)
-ma2 = List(2)
-mi0 = BitSet(2)
-mi1 = BitSet(2)
-mi2 = BitSet(2)
+ma0 = List(4)
+ma1 = List(4)
+ma2 = List(4)
+mi0 = Set(2)
+mi1 = Set(2)
+mi2 = Set(2)
 
-is0 = BitSet()
-is1 = BitSet()
-is2 = BitSet(2)
-is3 = BitSet()
+is0 = Set()
+is1 = Set()
+is2 = Set(2)
+is3 = Set()
 ib0 = False
 ib1 = False
 ib2 = True
@@ -26,8 +26,8 @@ ys0 = List()
 ys1 = List()
 ys2 = List(2)
 ys3 = List()
-ia0 = List()
-ia1 = List()
-ia2 = List(2)
+ia0 = List(0)
+ia1 = List(0)
+ia2 = List(4)
 ia3 = List()
 
diff --git a/test/files/run/bug1766.scala b/test/files/run/bug1766.scala
deleted file mode 100644
index 901f9ae664..0000000000
--- a/test/files/run/bug1766.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-object Test extends Application {
-
-  class C(s: String) {
-
-    def this(i: Int) = this("bar")
-
-    def f = {
-      val v: { def n: Int } = new { val n = 3 }
-      v.n
-    }
-
-  }
-
-  new C("foo").f
-
-}
diff --git a/test/files/run/bug2106.flags b/test/files/run/bug2106.flags
deleted file mode 100644
index eb4d19bcb9..0000000000
--- a/test/files/run/bug2106.flags
+++ /dev/null
@@ -1 +0,0 @@
--optimise
\ No newline at end of file
diff --git a/test/files/run/bug2106.scala b/test/files/run/bug2106.scala
deleted file mode 100644
index e8124dabab..0000000000
--- a/test/files/run/bug2106.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-class A extends Cloneable {
-  @inline final def foo = clone()
-}
-
-object Test {
-  val x = new A
-  def main(args: Array[String]) = x.foo
-}
diff --git a/test/files/run/bug3518.scala b/test/files/run/bug3518.scala
deleted file mode 100644
index 033cc19548..0000000000
--- a/test/files/run/bug3518.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-object Test {
-  val r1 = 1.0 to 10.0 by 0.5
-  val r2 = 1.0 to 1.0 by 1.0
-  val r3 = 10.0 to 1.0 by -0.5
-  val r4 = 1.0 until 1.0 by 1.0
-  val r5 = 1 to 100 by 2
-
-  def main(args: Array[String]): Unit = {
-    assert(r3 forall (r1 contains _))
-    assert(r1 forall (r3 contains _))
-    assert(r2.size == 1)
-    assert(r4.isEmpty)
-    assert(List(1,3,5,97,99) forall (r5 contains _))
-    assert(List(2,4,6,98,100) forall (x => !r5.contains(x)))
-  }
-}
diff --git a/test/files/run/bug3540.scala b/test/files/run/bug3540.scala
deleted file mode 100644
index 5ffacb5dff..0000000000
--- a/test/files/run/bug3540.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-object Test {
-  def main(args: Array[String]): Unit = {
-    assert(List.iterate(List(1,2,3), 4)(_.tail).last.isEmpty)
-    assert(Stream.iterate(Stream(1,2,3), 4)(_.tail).last.isEmpty)
-    assert(Array.iterate(Array(1,2,3), 4)(_.tail).last.isEmpty)
-  }
-}
diff --git a/test/files/run/bug3616.check b/test/files/run/bug3616.check
deleted file mode 100644
index f31e21baff..0000000000
--- a/test/files/run/bug3616.check
+++ /dev/null
@@ -1 +0,0 @@
-Fruit.ValueSet(A, B, C)
diff --git a/test/files/run/bug3616.scala b/test/files/run/bug3616.scala
deleted file mode 100644
index 777b97f9ab..0000000000
--- a/test/files/run/bug3616.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-object X extends Enumeration {
-    val Y = Value
-}
-object Fruit extends Enumeration {
-    val x = X.Y
-    val A,B,C = Value
-}
-object Test {
-  def main(args: Array[String]): Unit = {
-    println(Fruit.values)
-  }
-}
diff --git a/test/files/run/exceptions-nest.check b/test/files/run/exceptions-nest.check
deleted file mode 100644
index ae66da0a99..0000000000
--- a/test/files/run/exceptions-nest.check
+++ /dev/null
@@ -1,12 +0,0 @@
-2
-23
-2
-5
-2
-4
-OK
-4
-OK
-10
-1
-()
diff --git a/test/files/run/exceptions-nest.scala b/test/files/run/exceptions-nest.scala
deleted file mode 100644
index 40b00988e4..0000000000
--- a/test/files/run/exceptions-nest.scala
+++ /dev/null
@@ -1,139 +0,0 @@
-object Test extends Application {
-
-  println(test1)
-  println(test2)
-  println(test3)
-  println(test4)
-  println(test5)
-  try { println(test6) } catch { case _ => println("OK") }
-  println(test7)
-  try { println(test8) } catch { case _ => println("OK") }
-  println(test9)
-  println(test10)
-  println(test11)
-
-  def test1 = {
-    var x = 1
-    try {
-      x = 2
-    } catch {
-      case _: NullPointerException => x = 3
-      case _ => x = 4
-    }
-    x
-  }
-
-  def test2 = {
-    var x = 1
-    try {
-      x = 2
-      try {
-        x = 21
-      } catch {
-        case _ => x = 22
-      }
-      x = 23
-    } catch {
-      case _: NullPointerException => x = 3
-      case _ => x = 4
-    }
-    x
-  }
-
-  def test3 = {
-    var x = 1
-    try {
-      try{x = 2} catch { case _ => x = 4 }
-    } catch {
-      case _: NullPointerException => x = 3
-      case _ => x = 4
-    }
-    x
-  }
-
-  def test4 = {
-    var x = 1
-    try {
-      x = 2
-    } catch {
-      case _: NullPointerException => x = 3
-      case _ => x = 4
-    }
-    try {
-      x = 5
-    } catch {
-      case _: NullPointerException => x = 6
-    }
-    x
-  }
-
-  def test5 = {
-    var x = 1
-    try {
-      x = 2
-    } catch {
-      case _: NullPointerException => try { x = 3 } catch { case f => throw f }
-      case _ => x = 4; try { x = 41 } catch { case _: Exception => x = 42 }; x = 43
-    }
-    x
-  }
-
-  def test6: Int = {
-    var x = 1
-    try {
-      x = 2
-      (null: String).toString
-    } catch {
-      case e: NullPointerException =>
-        throw e
-      case _ =>
-        x = 3
-        return 1000
-    } finally {
-      x = 4
-      println(x)
-    }
-    x
-  }
-
-  def test7 = {
-    var x = 1
-    try {
-      x = 2
-    } finally {
-      try {
-        x = 4
-      } catch {
-        case _ => x = 5
-      }
-    }
-    x
-  }
-
-  def test8 = {
-    var x = 1
-    try {
-      throw new NullPointerException
-    } catch {
-      case e => throw e
-    }
-    x
-  }
-
-  def test9 = {
-    try { "" match {
-      case s: String => 10
-    }} catch { case _ => 20 }
-  }
-
-  var x10 = 1
-  def test10: Int = {
-    try { 1 }
-    catch { case e if (x10 == 1) => 1 }
-  }
-
-   def test11 {
-    try { () }
-    catch { case e => () }
-  }
-}
diff --git a/test/files/run/names-defaults.scala b/test/files/run/names-defaults.scala
index 8ddfcd950d..f197d2ff11 100644
--- a/test/files/run/names-defaults.scala
+++ b/test/files/run/names-defaults.scala
@@ -345,11 +345,6 @@ object Test extends Application {
   (new t3338.Test).a
 
 
-  // subclassing and defaults in both class constructors
-  class CBLAH(val x: Int = 1)
-  class DBLAH(val y: String = "2") extends CBLAH()
-  (new DBLAH())
-
 
   // DEFINITIONS
   def test1(a: Int, b: String) = println(a +": "+ b)
diff --git a/test/files/run/slice-strings.scala b/test/files/run/slice-strings.scala
deleted file mode 100644
index 129314387a..0000000000
--- a/test/files/run/slice-strings.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-object Test {
-  def cmp(x1: String) = {
-    val x2 = x1.toList
-
-    -10 to 10 foreach { i =>
-      assert(x1.take(i) == x2.take(i).mkString)
-      assert(x1.drop(i) == x2.drop(i).mkString)
-      assert(x1.takeRight(i) == x2.takeRight(i).mkString)
-      assert(x1.dropRight(i) == x2.dropRight(i).mkString)
-    }
-    for (idx1 <- -3 to 3 ; idx2 <- -3 to 3) {
-      assert(x1.slice(idx1, idx2) == x2.slice(idx1, idx2).mkString)
-    }
-  }
-
-  def main(args: Array[String]): Unit = {
-     cmp("abcde")
-  }
-}
diff --git a/test/files/run/t0432.scala b/test/files/run/t0432.scala
deleted file mode 100644
index 8ba9015d81..0000000000
--- a/test/files/run/t0432.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-object Test {
-  type valueType = { def value: this.type }
-
-  class StringValue(x: String) {
-    def value: this.type = this
-  }
-
-  def m(x: valueType) = x.value
-
-  val s = new StringValue("hei")
-
-  def main(args: Array[String]) {
-    m(s)
-  }
-}
diff --git a/test/files/run/t3493.scala b/test/files/run/t3493.scala
deleted file mode 100644
index aafe7a3a4a..0000000000
--- a/test/files/run/t3493.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-object Test {
-
-  def main(args: Array[String]) {
-    import scala.collection.immutable._
-    val x = TreeSet("a", "b", "c", "d")
-    val x2 = x + "e"
-    assert(x2.toString == "TreeSet(a, b, c, d, e)")
-    assert(x2.toString == runtime.ScalaRunTime.stringOf(x2).trim)
-  }
-
-}
diff --git a/test/files/run/t3496.scala b/test/files/run/t3496.scala
deleted file mode 100644
index e1aa032ab1..0000000000
--- a/test/files/run/t3496.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-// ticket #3496
-object Test {
-
-  def main(args: Array[String]) {
-    val s = Stream.from(1)
-    s.take(5)
-    s.drop(5)
-    s.splitAt(5)
-  }
-
-}
diff --git a/test/files/run/t3502.scala b/test/files/run/t3502.scala
deleted file mode 100644
index cc78e54c86..0000000000
--- a/test/files/run/t3502.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-// ticket #3502
-object Test {
-
-  object GeneratePrimeFactorsLazy extends (Int => List[Int]) {
-    override def apply(n:Int) = {
-      val s = Stream.range(2, n / 2).filter(n % _ == 0)
-      //val s = for (i <- Stream.range(2, n / 2); if n % i == 0) yield i
-      s.headOption.map(x => x :: apply(n / x)).getOrElse(List(n))
-    }
-  }
-
-  def main(args:Array[String]) {
-    // a prime number
-    //val num = 623456789
-    val num = 2796203
-    assert(GeneratePrimeFactorsLazy(num) == List(num))
-  }
-
-}
diff --git a/test/files/run/t3508.scala b/test/files/run/t3508.scala
deleted file mode 100644
index 01d976ba0d..0000000000
--- a/test/files/run/t3508.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-import collection.immutable._
-
-
-// ticket #3508
-object Test {
-  def main(args: Array[String]) {
-    assert(Stream.tabulate(123)(_ + 1).toList == List.tabulate(123)(_ + 1))
-  }
-}
diff --git a/test/files/run/t3511.scala b/test/files/run/t3511.scala
deleted file mode 100644
index 30757b1a66..0000000000
--- a/test/files/run/t3511.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-import scala.collection.immutable._
-
-
-// ticket #3511
-object Test {
-
-  def main(args: Array[String]) {
-    assert(Stream.from(0).view.force.take(5) == List(0, 1, 2, 3, 4))
-
-    val s = Stream.from(0)
-    val smap = s.view.map(_ * 2).force.take(5)
-    assert(smap == List(0, 2, 4, 6, 8))
-
-    val sfilter = s.view.filter(_ % 2 == 0).force.take(5)
-    assert(sfilter == List(0, 2, 4, 6, 8))
-
-    val sflatmap = s.view.flatMap(n => List(n, n * 2)).force.take(6)
-    assert(sflatmap == List(0, 0, 1, 2, 2, 4))
-
-    val stakewhile = s.view.takeWhile(_ < 10).force
-    assert(stakewhile == List.range(0, 10))
-
-    val szip = s.view.zip(s.map(_ / 2)).force.take(5)
-    assert(szip == List((0, 0), (1, 0), (2, 1), (3, 1), (4, 2)))
-
-    val szipall = s.view.zipAll(List(0, 1, 2), 0, 0).force.take(5)
-    assert(szipall == List((0, 0), (1, 1), (2, 2), (3, 0), (4, 0)))
-
-    val spatch = s.view.patch(1, List(5, 5, 5), 5).force.take(5)
-    assert(spatch == List(0, 5, 5, 5, 6))
-  }
-
-}
diff --git a/test/files/run/t3580.scala b/test/files/run/t3580.scala
deleted file mode 100644
index 50ff6c4551..0000000000
--- a/test/files/run/t3580.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-object Test {
-
-  class Empty extends Traversable[Nothing] {
-    def foreach[U](f: Nothing => U) {}
-  }
-
-  def main(args: Array[String]) {
-    val t = new Empty
-    t.toStream
-  }
-
-}
diff --git a/test/files/run/t3603.scala b/test/files/run/t3603.scala
deleted file mode 100644
index a89cb7080a..0000000000
--- a/test/files/run/t3603.scala
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-object Test {
-
-  def main(args: Array[String]) {
-    import collection.immutable._
-
-    val intmap = IntMap(1 -> 1, 2 -> 2)
-    val intres = intmap.map { case (a, b) => (a, b.toString) }
-    assert(intres.isInstanceOf[IntMap[_]])
-
-    val longmap = LongMap(1L -> 1, 2L -> 2)
-    val longres = longmap.map { case (a, b) => (a, b.toString) }
-    assert(longres.isInstanceOf[LongMap[_]])
-  }
-
-}
diff --git a/test/files/run/t3645.scala b/test/files/run/t3645.scala
deleted file mode 100644
index af2543377b..0000000000
--- a/test/files/run/t3645.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-object Test {
-  def main(args: Array[String]) {
-    val s = Stream.tabulate(5)(x => x+2)
-    assert( s.toList == List(2,3,4,5,6) )
-  }
-}
diff --git a/test/files/run/weakconform.scala b/test/files/run/weakconform.scala
deleted file mode 100755
index 1ea81c9f64..0000000000
--- a/test/files/run/weakconform.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-object Test extends Application {
-  val x: Float = 10/3
-  assert(x == 3.0)
-}
diff --git a/test/files/run/xml-loop-bug.scala b/test/files/run/xml-loop-bug.scala
deleted file mode 100644
index 3894779f7c..0000000000
--- a/test/files/run/xml-loop-bug.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-object Test {
-  def main(args: Array[String]): Unit = {
-    scala.tools.nsc.io.NullPrintStream.setOutAndErr()
-    scala.xml.parsing.ConstructingParser.fromSource(scala.io.Source.fromString("<!DOCTYPE xmeml SYSTEM> <xmeml> <sequence> </sequence> </xmeml> "), true).document.docElem
-  }
-}