run srewrite version 88d3cd4126d135617a8189f0a855757d7e2ab806 on tests/untried/pos

Author: samuelgruetter

tests/untried/pos/builders.scala

@@ -1,18 +1,18 @@
 object builders {
 
   trait Builder[-From, +To, -Elem] {
-    def += (elem: Elem)
+    def += (elem: Elem): Unit
     def result: To
   }
 
-  implicit def iterableBuilder[A, B] = new Builder[Iterable[A], Iterable[B], B] {
+  implicit def iterableBuilder[A, B]: builders.Builder[Iterable[A],Iterable[B],B] = new Builder[Iterable[A], Iterable[B], B] {
     println("new iterable builder")
     private val buf = new scala.collection.mutable.ListBuffer[B]
     def += (elem: B): Unit = { buf += elem }
     def result: Iterable[B] = buf.toList
   }
 
-  implicit def listBuilder[A, B] = new Builder[List[A], List[B], B] {
+  implicit def listBuilder[A, B]: builders.Builder[List[A],List[B],B] = new Builder[List[A], List[B], B] {
     println("new list builder")
     private val buf = new scala.collection.mutable.ListBuffer[B]
     def += (elem: B): Unit = { buf += elem }

tests/untried/pos/exbound.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/generic-sigs.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/hk-infer.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/needstypeearly.scala

@@ -1,4 +1,9 @@
 abstract class NeedsXEarly {
   val x: Int
 }
-class Foo extends { val x = 1 } with NeedsXEarly
+class Foo extends NeedsXEarly {
+// TODO NEEDS MANUAL CHANGE (early initializers)
+// BEGIN copied early initializers
+val x = 1
+// END copied early initializers
+}

tests/untried/pos/overloaded_extractor_and_regular_def.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/pos-bug1241.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/presuperContext.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/spec-arrays.scala

@@ -1,6 +1,6 @@
 abstract class AbsArray[T] {
   def apply(idx: Int): T
-  def update(idx: Int, elem: T)
+  def update(idx: Int, elem: T): Unit
   def length: Int
   def applyByte(idx: Int): Byte = apply(idx).asInstanceOf[Byte]
   def updateByte(idx: Int, elem: Byte) = update(idx, elem.asInstanceOf[T])
@@ -44,7 +44,7 @@ class SpecArray[@specialized T](arr: Array[T]) extends AbsArray[T] {
 
 abstract class Test {
   def sum(): Int
-  def modify(i: Int)
+  def modify(i: Int): Unit
   def run(): Unit = {
     var s = 0
     for (i <- 1 to 1000000) {

tests/untried/pos/t1614/foo.scala

@@ -1,6 +1,6 @@
 // foo.scala
 trait Foo {
-  def foo(arg: List[_])
+  def foo(arg: List[_]): Unit
 }
 trait FooImpl extends Foo {
     def foo(arg: List[_]): Unit = {}

tests/untried/pos/t3363-new.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/t3363-old.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/t3480.scala

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

tests/untried/pos/t3577.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/t3856.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)
 }