-target 1.5 now the default.

8 files changed, 12 insertions, 13 deletions

diff --git a/test/files/jvm/typerep.check b/test/files/jvm/typerep.check
index 410654627f..ff98348304 100644
--- a/test/files/jvm/typerep.check
+++ b/test/files/jvm/typerep.check
@@ -9,7 +9,6 @@ Float
 Double
 String
 Unit
-Class
 
 Some[Int]
 Some[Int]
diff --git a/test/files/jvm/typerep.scala b/test/files/jvm/typerep.scala
index f0aac8e935..b133d7ce99 100644
--- a/test/files/jvm/typerep.scala
+++ b/test/files/jvm/typerep.scala
@@ -17,6 +17,7 @@ object Test extends Application {
 
 object serialize {
   import java.io._
+
   @throws(classOf[IOException])
   def write[A](o: A): Array[Byte] = {
     val ba = new ByteArrayOutputStream(512)
@@ -48,7 +49,7 @@ object testPrimitives {
   println(getType(0.0d))
   println(getType("abc"))
   println(getType(())) // Unit
-  println(getType(classOf[Int])) // Class
+//  println(getType(classOf[Int])) // Class
   println
 }
 
@@ -172,9 +173,8 @@ object TypeRep {
   implicit def floatRep: TypeRep[Float] = FloatRep
   implicit def doubleRep: TypeRep[Double] = DoubleRep
 
-  type AnyClass = Class[_]
   implicit def unitRep: TypeRep[Unit] = UnitRep
-  implicit def classRep: TypeRep[AnyClass] = ClassRep
+//  implicit def classRep: TypeRep[Class] = ClassRep
   implicit def stringRep: TypeRep[String] = StringRep
   implicit def noneRep: TypeRep[Option[Nothing]] = NoneRep[Nothing](NothingRep.asInstanceOf[TypeRep[Nothing]])
   implicit def anyRep: TypeRep[Any] = AnyRep
@@ -257,9 +257,9 @@ object TypeRep {
   case object UnitRep extends TypeRep[Unit] {
     override def toString = "Unit"
   }
-  case object ClassRep extends TypeRep[AnyClass] {
-    override def toString = "Class"
-  }
+//  case object ClassRep extends TypeRep[AnyClass] {
+//    override def toString = "Class"
+//  }
   case object StringRep extends TypeRep[String] {
     override def toString = "String"
   }
diff --git a/test/files/jvm5/annotations.scala b/test/files/jvm5/annotations.scala
index 107bebbee7..98b82edad4 100644
--- a/test/files/jvm5/annotations.scala
+++ b/test/files/jvm5/annotations.scala
@@ -133,7 +133,7 @@ object Test5 {
     private var count: Integer = 0
 
     private val getter =
-      getClass().getMethod("getCount", Array[java.lang.Class]())
+      getClass().getMethod("getCount", Array[java.lang.Class[T] forSome { type T }]())
     private val setter =
       getClass().getMethod("setCount", Array(classOf[Integer]))
 
diff --git a/test/files/neg/bug1010.check b/test/files/neg/bug1010.check
index 3cf9738eaa..35390aa88a 100644
--- a/test/files/neg/bug1010.check
+++ b/test/files/neg/bug1010.check
@@ -1,6 +1,6 @@
 bug1010.scala:14: error: type mismatch;
  found   : MailBox#Message
- required: _3.in.Message where val _3: Actor
+ required: _16.in.Message where val _16: Actor
    unstable.send(msg) // in.Message becomes unstable.Message, but that's ok since Message is a concrete type member
                  ^
 one error found
diff --git a/test/files/neg/bug608.check b/test/files/neg/bug608.check
index 8337c513ff..e0acf6fa0f 100644
--- a/test/files/neg/bug608.check
+++ b/test/files/neg/bug608.check
@@ -1,6 +1,6 @@
 bug608.scala:16: error: type mismatch;
  found   : (a) => a
- required: (_1.a) => ? where val _1: hs{type s = hs; type a = ha}
+ required: (_14.a) => ? where val _14: hs{type s = hs; type a = ha}
 	     = g(f(x).bimap(id))
                             ^
 one error found
diff --git a/test/files/neg/sabin2.check b/test/files/neg/sabin2.check
index 92578bc23e..070b03a54b 100644
--- a/test/files/neg/sabin2.check
+++ b/test/files/neg/sabin2.check
@@ -1,6 +1,6 @@
 sabin2.scala:22: error: type mismatch;
  found   : Test.Base#T
- required: _7.T where val _7: Test.Base
+ required: _20.T where val _20: Test.Base
    a.set(b.get()) // Error
            ^
 one error found
diff --git a/test/files/neg/t0209.check b/test/files/neg/t0209.check
index 38b911533f..19e06d10b9 100644
--- a/test/files/neg/t0209.check
+++ b/test/files/neg/t0209.check
@@ -1,6 +1,6 @@
 t0209.scala:15: error: type mismatch;
  found   : C
- required: _1 where val _1: A
+ required: _14 where val _14: A
     (new B: A).f(new C)
                  ^
 one error found
diff --git a/test/files/run/streams.scala b/test/files/run/streams.scala
index 5f61cb11af..1e781a6171 100644
--- a/test/files/run/streams.scala
+++ b/test/files/run/streams.scala
@@ -22,7 +22,7 @@ object Test extends Application {
   println(s2.dropWhile(_ > 0))
   println
 
-  val s3 = Stream.range(1, 10000) //100000 (ticket #153: Stackoverflow)
+  val s3 = Stream.range(1, 1000) //100000 (ticket #153: Stackoverflow)
   println(s3.length)
 
   // ticket #153