Merge pull request #294 from samuelgruetter/tests-rewrite-2

Run rewrite tool on tests (2)

Author: odersky

tests/untried/pos/CustomGlobal.scala renamed to tests/pending/pos/CustomGlobal.scala

@@ -3,5 +3,5 @@ class A[T <: A[T]] {
 }
 
 object Test {
-  val x: A[X] forSome { type X } = null
+  val x: A[_] = null
 }

tests/untried/pos/List1.scala renamed to tests/pending/pos/List1.scala

@@ -11,7 +11,7 @@ object A {
   def f6(x: Int) = new Bippy[t forSome { type t <: Int }]
   def f7(x: T forSome { type T <: Float }) = x
   def f8(x: T forSome { type T <: Unit }) = x
-  def f9(x: T forSome { type T <: runtime.BoxedUnit }) = x
+  def f9(x: T forSome { type T <: scala.runtime.BoxedUnit }) = x
   def f10(x: Int) = new Bippy[t forSome { type t <: Unit }]
   def f11(x: Int) = new Bippy[t forSome { type t >: Null }]
 

tests/untried/pos/MailBox.scala renamed to tests/pending/pos/MailBox.scala

@@ -20,7 +20,7 @@ object ShouldWorkHK {
     def underlying = xs
     def BOOP(ys: Seq[M[_]]) = new Booper(xs ++ ys)
   }
-  implicit def mkBoop[M[_]](xs: Seq[M[_]]) = new Booper(xs)
+  implicit def mkBoop[M[_]](xs: Seq[M[_]]): ShouldWorkHK.Booper[M] = new Booper(xs)
 
   def f1 = x BOOP y BOOP x1 BOOP x2
 }
@@ -30,7 +30,7 @@ object DoesWorkHK {
     def underlying = xs
     def BOOP(ys: Seq[M[_]]) = new Booper[M](xs ++ ys)
   }
-  implicit def mkBoop[M[_]](xs: Seq[M[_]]) = new Booper[M](xs)
+  implicit def mkBoop[M[_]](xs: Seq[M[_]]): DoesWorkHK.Booper[M] = new Booper[M](xs)
 
   def f1 = x BOOP y BOOP x1 BOOP x2
 }

tests/untried/pos/NoCyclicReference.scala renamed to tests/pending/pos/NoCyclicReference.scala

@@ -12,7 +12,7 @@ trait TreesBase {
 }
 
 trait TreesApi extends TreesBase {
-  def Apply(x: String)
+  def Apply(x: String): Unit
 }
 
 class Universe extends TreesApi {

tests/untried/pos/S5.scala renamed to tests/pending/pos/S5.scala

@@ -1,6 +1,6 @@
 object test extends App {
   // more..
-  type T = { def hello() }
+  type T = { def hello(): Unit }
   //val x4 = new AnyRef { def hello() { println("4") } } // ok!
   val x4: T = new { def hello(): Unit = { println("4") } }        // error!
   x4.hello()

tests/untried/pos/SI-5788.scala renamed to tests/pending/pos/SI-5788.scala

@@ -1,5 +1,10 @@
 class A {
-  class C extends { val x: A = this } with AnyRef
+  class C extends AnyRef {
+// TODO NEEDS MANUAL CHANGE (early initializers)
+// BEGIN copied early initializers
+val x: A = this
+// END copied early initializers
+}
 }
 
 class B(x: Int)

tests/untried/pos/SI-7638.scala renamed to tests/pending/pos/SI-7638.scala

@@ -7,7 +7,7 @@ object TestCase {
 
         //if fs was reduced to List (generic type with one parameter) then the code compiles
         //if you inherit from MapOps[T] instead of MapOps[F] then code compiles fine
-        implicit def map2ops[T,F](fs: Map[T,F]) = new MapOps[F] {
+        implicit def map2ops[T,F](fs: Map[T,F]): TestCase.MapOps[F]{lazy val m: reflect.runtime.universe.TypeTag[T]; def is(xs: List[T]): List[List[T]]} = new MapOps[F] {
           //if you remove this line, then code compiles
       lazy val m: TypeTag[T] = sys.error("just something to make it compile")
       def is(xs: List[T]) = List(xs)

tests/untried/pos/annotDepMethType.scala renamed to tests/pending/pos/annotDepMethType.scala

@@ -5,7 +5,7 @@ object TestCase {
 
         //if fs was reduced to List (generic type with one parameter) then the code compiles
         //if you inherit from MapOps[T] instead of MapOps[F] then code compiles fine
-        implicit def map2ops[T,F](fs: Map[T,F]) = new MapOps[F] {
+        implicit def map2ops[T,F](fs: Map[T,F]): TestCase.MapOps[F]{lazy val m: Manifest[T]; def is(xs: List[T]): List[List[T]]} = new MapOps[F] {
           //if you remove this line, then code compiles
 	    lazy val m: Manifest[T] = sys.error("just something to make it compile")
 	    def is(xs: List[T]) = List(xs)

tests/untried/pos/annotated-original/C_2.scala renamed to tests/pending/pos/annotated-original/C_2.scala

@@ -0,0 +1,4 @@
+object Test {
+  val List(_*) = List(1)
+	val Array( who, what : _* ) = "Eclipse plugin cannot not handle this" split (" ")
+}

tests/untried/pos/annotated-original/M_1.scala renamed to tests/pending/pos/annotated-original/M_1.scala

@@ -4,7 +4,7 @@ case class C2(checks: Check[_]*);
 
 object C {
   def m(x : C2): Any = (null: Any) match {
-    case C2(_, rest @ _*) => {
+    case C2(_, rest : _*) => {
       rest.map(_.value)
     }
   }

tests/untried/pos/annotated-treecopy/Impls_Macros_1.scala renamed to tests/pending/pos/annotated-treecopy/Impls_Macros_1.scala

@@ -4,6 +4,6 @@ case class CS(xs: C[_]*)
 
 // t3856
 object Test {
-  val x = CS(C(5), C("abc")) match { case CS(C(5), xs @ _*) => xs }
+  val x = CS(C(5), C("abc")) match { case CS(C(5), xs : _*) => xs }
   println(x)
 }

tests/untried/pos/annotated-treecopy/Test_2.scala renamed to tests/pending/pos/annotated-treecopy/Test_2.scala

@@ -0,0 +1,10 @@
+object Test {
+  def main(args: Array[String]): Unit = {
+    new AnyRef {
+// TODO NEEDS MANUAL CHANGE (early initializers)
+// BEGIN copied early initializers
+val x = "abc"
+// END copied early initializers
+ }
+  }
+}

tests/untried/pos/annotations.scala renamed to tests/pending/pos/annotations.scala

@@ -1,5 +1,5 @@
 trait VectorLike[+T, +V[A] <: Vector[A]] {
-  def +[S, VResult[S] >: V[S]](v: VResult[S])
+  def +[S, VResult[S] >: V[S]](v: VResult[S]): Unit
 }
 
 trait Vector[+T] extends VectorLike[T, Vector]

tests/untried/pos/arrays2.scala renamed to tests/pending/pos/arrays2.scala

@@ -1,9 +1,9 @@
 trait FM[A] {
-  def map(f: A => Any)
+  def map(f: A => Any): Unit
 }
 
 trait M[A] extends FM[A] {
-  def map(f: A => Any)
+  def map(f: A => Any): Unit
 }
 
 trait N[A] extends FM[A]