11 files changed, 22 insertions, 95 deletions
diff --git a/test/pending/run/array_casts.scala b/test/pending/run/array_casts.scala
index 9d298bbc2b..0691fe06fe 100644
--- a/test/pending/run/array_casts.scala
+++ b/test/pending/run/array_casts.scala
@@ -36,7 +36,7 @@ object Test {
      Console.println("is-seq array " + s.isInstanceOf[Array[Char]])
      try {
        Console.println(s.asInstanceOf[Array[Int]].getClass)
-     } catch { case ex : ClassCastException => Console.println("Bad, arrays as seqs should still be arrays of int") }
+     } catch { case ex : ClassCastException => Console.println("Bad, arrays as seqs should still be arrays of Int") }
      ()
    }
 }
diff --git a/test/pending/run/bug0412.scala b/test/pending/run/bug0412.scala
deleted file mode 100644
index 4610235427..0000000000
--- a/test/pending/run/bug0412.scala
+++ /dev/null
@@ -1,33 +0,0 @@
-object Magic {
-
-  abstract class A[T1,T2]() {
-    trait C            { type T; }
-    trait C1 extends C { type T = T1; }
-    trait C2 extends C { type T <: T2; }
-
-    type CX;
-
-    var cv: CX with C2 = _;
-    val c: CX with C2 = cv;
-
-    def castA(x: c.T): T2 = x;
-  }
-
-  class B[T1,T2] extends A[T1,T2]() {
-    type CX = C1;
-
-    def castB(x: T1): T2 = castA(x);
-  }
-
-  def cast[T1,T2](v: T1): T2 =
-    new B[T1,T2]().castB(v)
-
-}
-
-object Test {
-
-  def main(args: Array[String]): Unit = {
-    Magic.cast[String,Exception]("xyz").printStackTrace();
-  }
-
-}
diff --git a/test/pending/run/bug0551.scala b/test/pending/run/bug0551.scala
deleted file mode 100644
index ffa36d7cb0..0000000000
--- a/test/pending/run/bug0551.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-case class A(x: int)
-class B(x: int) extends A(x)
-object Test extends Application {
-  Console.println(A(1) == new B(1))
-}
diff --git a/test/pending/run/bug424.scala b/test/pending/run/bug424.scala
deleted file mode 100644
index bc7a55732d..0000000000
--- a/test/pending/run/bug424.scala
+++ /dev/null
@@ -1,3 +0,0 @@
-object M {
-  def f = 3;
-}
diff --git a/test/pending/run/bug874.scala b/test/pending/run/bug874.scala
index 29dfabe0e9..d83014651b 100644
--- a/test/pending/run/bug874.scala
+++ b/test/pending/run/bug874.scala
@@ -1,12 +1,12 @@
 object Test {
   abstract class Base {
     val U: {
-      def apply[A](x1: A)(x2: int): Any
+      def apply[A](x1: A)(x2: Int): Any
     }
     U("xyz")(2)
   }
   class Mix extends Base {
-    case class U[A](x1: A)(x2: int) {
+    case class U[A](x1: A)(x2: Int) {
       Console.println("U created with "+x1+" and "+x2)
     }
   }
diff --git a/test/pending/run/collections.scala b/test/pending/run/collections.scala
index 6717b524bb..16a3ddb370 100644
--- a/test/pending/run/collections.scala
+++ b/test/pending/run/collections.scala
@@ -4,15 +4,15 @@ object Test extends Application {
 
   val printTime = false
 
-  def sum[A](xs: Iterable[int]) = (0 /: xs)((x, y) => x + y)
+  def sum[A](xs: Iterable[Int]) = (0 /: xs)((x, y) => x + y)
 
-  def time(op: => unit): unit = {
+  def time(op: => Unit): Unit = {
     val start = System.currentTimeMillis;
     op
     if (printTime) Console.println("  time = "+(System.currentTimeMillis - start)+"ms")
   }
 
-  def test(msg: String, s0: collection.immutable.Set[int]) = {
+  def test(msg: String, s0: collection.immutable.Set[Int]) = {
     Console.println("***** "+msg+":")
     var s = s0
     s = s + 2
@@ -30,7 +30,7 @@ object Test extends Application {
     }
   }
 
-  def test(msg: String, s0: collection.mutable.Set[int]) = {
+  def test(msg: String, s0: collection.mutable.Set[Int]) = {
     Console.println("***** "+msg+":")
     var s = s0
     s = s + 2
@@ -48,7 +48,7 @@ object Test extends Application {
     }
   }
 
-  def test(msg: String, s0: collection.immutable.Map[int, int]) = {
+  def test(msg: String, s0: collection.immutable.Map[Int, Int]) = {
     Console.println("***** "+msg+":")
     var s = s0
     s = s + (2 -> 2)
@@ -69,7 +69,7 @@ object Test extends Application {
     }
   }
 
-  def test(msg: String, s0: collection.mutable.Map[int, int]) = {
+  def test(msg: String, s0: collection.mutable.Map[Int, Int]) = {
     Console.println("***** "+msg+":")
     var s = s0
     s = s + (2 -> 2)
@@ -90,13 +90,13 @@ object Test extends Application {
     }
   }
 
-  test("immutable.ListSet", new immutable.ListSet[int])
-  test("immutable.TreeSet", new immutable.TreeSet[int])
-  test("mutable.HashSet", new mutable.HashSet[int])
-  test("immutable.ListMap", new immutable.ListMap[int, int])
-  test("immutable.TreeMap", new immutable.TreeMap[int, int])
-  test("immutable.UnBalancedTreeMap", new immutable.UnbalancedTreeMap[int, int])
-  test("immutable.HashTreeSet", new immutable.HashTreeSet[int])
-  test("immutable.HashTreeMap", new immutable.HashTreeMap[int, int])
-  test("mutable.HashMap", new mutable.HashMap[int, int])
+  test("immutable.ListSet", new immutable.ListSet[Int])
+  test("immutable.TreeSet", new immutable.TreeSet[Int])
+  test("mutable.HashSet", new mutable.HashSet[Int])
+  test("immutable.ListMap", new immutable.ListMap[Int, Int])
+  test("immutable.TreeMap", new immutable.TreeMap[Int, Int])
+  test("immutable.UnBalancedTreeMap", new immutable.UnbalancedTreeMap[Int, Int])
+  test("immutable.HashTreeSet", new immutable.HashTreeSet[Int])
+  test("immutable.HashTreeMap", new immutable.HashTreeMap[Int, Int])
+  test("mutable.HashMap", new mutable.HashMap[Int, Int])
 }
diff --git a/test/pending/run/exc.scala b/test/pending/run/exc.scala
deleted file mode 100644
index 26f80412c0..0000000000
--- a/test/pending/run/exc.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-object exc1 extends Application {
-  def foo() = {
-    while (true) {
-      try {
-      } catch {
-        case ex: Exception =>
-      }
-    }
-  }
-}
diff --git a/test/pending/run/exc1.scala b/test/pending/run/exc1.scala
deleted file mode 100644
index 48fc084dda..0000000000
--- a/test/pending/run/exc1.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-object exc1 extends Application {
-  def foo(): unit = {
-    while (true) {
-      try {
-      } catch {
-        case ex: Exception =>
-      }
-    }
-  }
-}
diff --git a/test/pending/run/exc2.scala b/test/pending/run/exc2.scala
deleted file mode 100644
index 8adf9b4a37..0000000000
--- a/test/pending/run/exc2.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-object exc2 extends Application {
-  def foo() = {
-    while (true) {
-      try {
-        Console.println("foo")
-      } catch {
-        case ex: Exception =>
-          Console.println("bar")
-      }
-    }
-  }
-}
diff --git a/test/pending/run/records.scala b/test/pending/run/records.scala
index 87b15265f2..0447b6f085 100644
--- a/test/pending/run/records.scala
+++ b/test/pending/run/records.scala
@@ -1,10 +1,10 @@
 trait C {
-  def f: int
+  def f: Int
 }
 
 object Test {
   type T = C {
-    def f: int
+    def f: Int
     def g: String
   }
 
diff --git a/test/pending/run/t0947.scala b/test/pending/run/t0947.scala
index f5daca3d30..4297bb8777 100644
--- a/test/pending/run/t0947.scala
+++ b/test/pending/run/t0947.scala
@@ -3,6 +3,6 @@ import scala.tools.nsc._
 object Test extends Application {
   class Foo { override def toString = "Foo" };
 
-  val int = new Interpreter(new Settings());
-  int.bind("foo", "Test.Foo", new Test.Foo());
+  val Int = new Interpreter(new Settings());
+  Int.bind("foo", "Test.Foo", new Test.Foo());
 }