repairs the tests after the refactoring spree

54 files changed, 140 insertions, 161 deletions

diff --git a/test/pending/neg/reify_packed.scala b/test/pending/neg/reify_packed.scala
index 0240f2a4b5..2004e031d5 100644
--- a/test/pending/neg/reify_packed.scala
+++ b/test/pending/neg/reify_packed.scala
@@ -1,3 +1,8 @@
+import scala.reflect.runtime.universe._
+import scala.reflect.runtime.{universe => ru}
+import scala.reflect.runtime.{currentMirror => cm}
+import scala.tools.reflect.ToolBox
+
 object Test extends App {
   reify {
     class C { override def toString() = "C" }
@@ -5,6 +10,6 @@ object Test extends App {
     ret.asInstanceOf[List[_]]
   };
 
-  val toolbox = mkToolBox()
+  val toolbox = cm.mkToolBox()
   println(toolbox.runExpr(code.tree))
-}
+}
\ No newline at end of file
diff --git a/test/pending/pos/inference.scala b/test/pending/pos/inference.scala
index 3672351fca..ee462b6bcc 100644
--- a/test/pending/pos/inference.scala
+++ b/test/pending/pos/inference.scala
@@ -1,14 +1,16 @@
+import scala.reflect.runtime.universe._
+
 // inference illuminator
 object Test {
-  class D1[T1 : TypeTag, T2 <: T1 : TypeTag](x: T1) { println(typeTag[(T1, T2)]) }
-  class D2[T1 : TypeTag, T2 >: T1 : TypeTag](x: T1) { println(typeTag[(T1, T2)]) }
-  class D3[+T1 : TypeTag, T2 <: T1 : TypeTag](x: T1) { println(typeTag[(T1, T2)]) }
-  class D4[-T1 : TypeTag, T2 >: T1 : TypeTag](x: T1) { println(typeTag[(T1, T2)]) }
+  class D1[T1 : TypeTag, T2 <: T1 : TypeTag](x: T1) { println(typeOf[(T1, T2)]) }
+  class D2[T1 : TypeTag, T2 >: T1 : TypeTag](x: T1) { println(typeOf[(T1, T2)]) }
+  class D3[+T1 : TypeTag, T2 <: T1 : TypeTag](x: T1) { println(typeOf[(T1, T2)]) }
+  class D4[-T1 : TypeTag, T2 >: T1 : TypeTag](x: T1) { println(typeOf[(T1, T2)]) }
 
-  class E1[T1 : TypeTag, T2 <: T1 : TypeTag](x: D1[T1, T2]) { println(typeTag[(T1, T2)]) }
-  class E2[T1 : TypeTag, T2 >: T1 : TypeTag](x: D2[T1, T2]) { println(typeTag[(T1, T2)]) }
-  class E3[+T1 : TypeTag, T2 <: T1 : TypeTag](x: D3[T1, T2]) { println(typeTag[(T1, T2)]) }
-  class E4[-T1 : TypeTag, T2 >: T1 : TypeTag](x: D4[T1, T2]) { println(typeTag[(T1, T2)]) }
+  class E1[T1 : TypeTag, T2 <: T1 : TypeTag](x: D1[T1, T2]) { println(typeOf[(T1, T2)]) }
+  class E2[T1 : TypeTag, T2 >: T1 : TypeTag](x: D2[T1, T2]) { println(typeOf[(T1, T2)]) }
+  class E3[+T1 : TypeTag, T2 <: T1 : TypeTag](x: D3[T1, T2]) { println(typeOf[(T1, T2)]) }
+  class E4[-T1 : TypeTag, T2 >: T1 : TypeTag](x: D4[T1, T2]) { println(typeOf[(T1, T2)]) }
 
   def main(args: Array[String]): Unit = {
     // WHY YOU NO LIKE NOTHING SO MUCH SCALAC?
@@ -36,4 +38,4 @@ object Test {
   //     new E3(d3)
   //            ^
   // two errors found
-}
+}
\ No newline at end of file
diff --git a/test/pending/run/macro-expand-default/Impls_1.scala b/test/pending/run/macro-expand-default/Impls_1.scala
index fefe8fc4e2..a539982b45 100644
--- a/test/pending/run/macro-expand-default/Impls_1.scala
+++ b/test/pending/run/macro-expand-default/Impls_1.scala
@@ -2,9 +2,9 @@ import scala.reflect.makro.{Context => Ctx}
 
 object Impls {
   def foo(c: Ctx)(x: c.Expr[Int], y: c.Expr[Int]) = {
-    import c.mirror._
+    import c.universe._
     val sum = Apply(Select(x.tree, newTermName("$minus")), List(y.tree))
     val body = Apply(Select(Ident(definitions.PredefModule), newTermName("println")), List(sum))
     Expr[Unit](body)
   }
-}
+}
\ No newline at end of file
diff --git a/test/pending/run/macro-expand-implicit-macro-defeats-type-inference/Impls_1.scala b/test/pending/run/macro-expand-implicit-macro-defeats-type-inference/Impls_1.scala
index c096a83c5e..1740f40daf 100644
--- a/test/pending/run/macro-expand-implicit-macro-defeats-type-inference/Impls_1.scala
+++ b/test/pending/run/macro-expand-implicit-macro-defeats-type-inference/Impls_1.scala
@@ -2,9 +2,9 @@ import scala.reflect.makro.Context
 
 object Impls {
   def foo[T: c.TypeTag](c: Context): c.Expr[List[T]] = c.reify {
-    println("openImplicits are: " + c.literal(c.openImplicits.toString).eval)
-    println("enclosingImplicits are: " + c.literal(c.enclosingImplicits.toString).eval)
-    println("typetag is: " + c.literal(c.tag[T].toString).eval)
+    println("openImplicits are: " + c.literal(c.openImplicits.toString).splice)
+    println("enclosingImplicits are: " + c.literal(c.enclosingImplicits.toString).splice)
+    println("typetag is: " + c.literal(c.tag[T].toString).splice)
     null
   }
 }
\ No newline at end of file
diff --git a/test/pending/run/macro-expand-implicit-macro-has-context-bound.check b/test/pending/run/macro-expand-macro-has-context-bound.check
index ac4213d6e9..ac4213d6e9 100644
--- a/test/pending/run/macro-expand-implicit-macro-has-context-bound.check
+++ b/test/pending/run/macro-expand-macro-has-context-bound.check
diff --git a/test/pending/run/macro-expand-implicit-macro-has-context-bound.flags b/test/pending/run/macro-expand-macro-has-context-bound.flags
index cd66464f2f..cd66464f2f 100644
--- a/test/pending/run/macro-expand-implicit-macro-has-context-bound.flags
+++ b/test/pending/run/macro-expand-macro-has-context-bound.flags
diff --git a/test/pending/run/macro-expand-implicit-macro-has-context-bound/Impls_1.scala b/test/pending/run/macro-expand-macro-has-context-bound/Impls_1.scala
index 5c50576281..3cee65ce72 100644
--- a/test/pending/run/macro-expand-implicit-macro-has-context-bound/Impls_1.scala
+++ b/test/pending/run/macro-expand-macro-has-context-bound/Impls_1.scala
@@ -2,9 +2,9 @@ import scala.reflect.makro.{Context => Ctx}
 
 object Impls {
   def foo[U](c: Ctx)(x: c.Expr[U])(evidence: c.Expr[Numeric[U]]) = {
-    import c.mirror._
+    import c.universe._
     val plusOne = Apply(Select(evidence.tree, newTermName("plus")), List(x.tree, Literal(Constant(1))))
     val body = Apply(Select(Ident(definitions.PredefModule), newTermName("println")), List(plusOne))
     Expr[Unit](body)
   }
-}
+}
\ No newline at end of file
diff --git a/test/pending/run/macro-expand-implicit-macro-has-context-bound/Macros_Test_2.scala b/test/pending/run/macro-expand-macro-has-context-bound/Macros_Test_2.scala
index 7d16b773a6..7d16b773a6 100644
--- a/test/pending/run/macro-expand-implicit-macro-has-context-bound/Macros_Test_2.scala
+++ b/test/pending/run/macro-expand-macro-has-context-bound/Macros_Test_2.scala
diff --git a/test/pending/run/macro-expand-named/Impls_1.scala b/test/pending/run/macro-expand-named/Impls_1.scala
index fefe8fc4e2..a539982b45 100644
--- a/test/pending/run/macro-expand-named/Impls_1.scala
+++ b/test/pending/run/macro-expand-named/Impls_1.scala
@@ -2,9 +2,9 @@ import scala.reflect.makro.{Context => Ctx}
 
 object Impls {
   def foo(c: Ctx)(x: c.Expr[Int], y: c.Expr[Int]) = {
-    import c.mirror._
+    import c.universe._
     val sum = Apply(Select(x.tree, newTermName("$minus")), List(y.tree))
     val body = Apply(Select(Ident(definitions.PredefModule), newTermName("println")), List(sum))
     Expr[Unit](body)
   }
-}
+}
\ No newline at end of file
diff --git a/test/pending/run/macro-expand-tparams-prefix-e1/Impls_1.scala b/test/pending/run/macro-expand-tparams-prefix-e1/Impls_1.scala
index bc880fdf77..d7df919552 100644
--- a/test/pending/run/macro-expand-tparams-prefix-e1/Impls_1.scala
+++ b/test/pending/run/macro-expand-tparams-prefix-e1/Impls_1.scala
@@ -2,11 +2,11 @@ import scala.reflect.makro.{Context => Ctx}
 
 object Impls {
   def foo[T, U: c.TypeTag, V](c: Ctx)(implicit T: c.TypeTag[T], V: c.TypeTag[V]): c.Expr[Unit] = {
-    import c.mirror._
+    import c.universe._
     Block(List(
       Apply(Select(Ident(definitions.PredefModule), newTermName("println")), List(Literal(Constant(T.toString)))),
       Apply(Select(Ident(definitions.PredefModule), newTermName("println")), List(Literal(Constant(implicitly[c.TypeTag[U]].toString)))),
       Apply(Select(Ident(definitions.PredefModule), newTermName("println")), List(Literal(Constant(V.toString))))),
       Literal(Constant(())))
   }
-}
+}
\ No newline at end of file
diff --git a/test/pending/run/macro-expand-tparams-prefix-e1/Macros_Test_2.scala b/test/pending/run/macro-expand-tparams-prefix-e1/Macros_Test_2.scala
index 5c863804d0..d4fc52fca0 100644
--- a/test/pending/run/macro-expand-tparams-prefix-e1/Macros_Test_2.scala
+++ b/test/pending/run/macro-expand-tparams-prefix-e1/Macros_Test_2.scala
@@ -1,4 +1,4 @@
-import scala.reflect.mirror._
+import scala.reflect.runtime.universe._
 
 object Test extends App {
   class D[T: TypeTag] {
diff --git a/test/pending/run/macro-expand-tparams-prefix-f1/Impls_1.scala b/test/pending/run/macro-expand-tparams-prefix-f1/Impls_1.scala
index bc880fdf77..d7df919552 100644
--- a/test/pending/run/macro-expand-tparams-prefix-f1/Impls_1.scala
+++ b/test/pending/run/macro-expand-tparams-prefix-f1/Impls_1.scala
@@ -2,11 +2,11 @@ import scala.reflect.makro.{Context => Ctx}
 
 object Impls {
   def foo[T, U: c.TypeTag, V](c: Ctx)(implicit T: c.TypeTag[T], V: c.TypeTag[V]): c.Expr[Unit] = {
-    import c.mirror._
+    import c.universe._
     Block(List(
       Apply(Select(Ident(definitions.PredefModule), newTermName("println")), List(Literal(Constant(T.toString)))),
       Apply(Select(Ident(definitions.PredefModule), newTermName("println")), List(Literal(Constant(implicitly[c.TypeTag[U]].toString)))),
       Apply(Select(Ident(definitions.PredefModule), newTermName("println")), List(Literal(Constant(V.toString))))),
       Literal(Constant(())))
   }
-}
+}
\ No newline at end of file
diff --git a/test/pending/run/macro-expand-tparams-prefix-f1/Macros_Test_2.scala b/test/pending/run/macro-expand-tparams-prefix-f1/Macros_Test_2.scala
index bc8e7ac75c..9417cf663e 100644
--- a/test/pending/run/macro-expand-tparams-prefix-f1/Macros_Test_2.scala
+++ b/test/pending/run/macro-expand-tparams-prefix-f1/Macros_Test_2.scala
@@ -1,4 +1,4 @@
-import scala.reflect.mirror._
+import scala.reflect.runtime.universe._
 
 object Test extends App {
   class D[T] {
diff --git a/test/pending/run/macro-reify-array/Macros_1.scala b/test/pending/run/macro-reify-array/Macros_1.scala
index af42321484..c1bd4187a6 100644
--- a/test/pending/run/macro-reify-array/Macros_1.scala
+++ b/test/pending/run/macro-reify-array/Macros_1.scala
@@ -5,7 +5,7 @@ object Macros {
 
   object Impls {
     def foo[T: c.TypeTag](c: Ctx)(s: c.Expr[T]) = c.reify {
-      Array(s.eval)
+      Array(s.splice)
     }
   }
 }
\ No newline at end of file
diff --git a/test/pending/run/macro-reify-eval-vs-value.flags b/test/pending/run/macro-reify-eval-vs-value.flags
deleted file mode 100644
index cd66464f2f..0000000000
--- a/test/pending/run/macro-reify-eval-vs-value.flags
+++ /dev/null
@@ -1 +0,0 @@
--language:experimental.macros
\ No newline at end of file
diff --git a/test/pending/run/macro-reify-eval-vs-value/Macros_1.scala b/test/pending/run/macro-reify-eval-vs-value/Macros_1.scala
deleted file mode 100644
index 98dd93b0f8..0000000000
--- a/test/pending/run/macro-reify-eval-vs-value/Macros_1.scala
+++ /dev/null
@@ -1,25 +0,0 @@
-import scala.reflect.makro.{Context => Ctx}
-
-object Macros {
-  def fooEval(s: String) = macro Impls.fooEval
-  def fooValue(s: String) = macro Impls.fooValue
-
-  object Impls {
-    def fooEval(c: Ctx)(s: c.Expr[String]) = c.reify {
-      println("hello " + s.eval)
-      println("hello " + s.eval)
-    }
-
-    def fooValue(c: Ctx)(s: c.Expr[String]) = c.reify {
-      {
-        println("hello " + s.value)
-        def sayHello = println(s.value)
-        sayHello
-      }
-      println("hello " + s.eval);
-      {
-        println("hello " + s.eval)
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/test/pending/run/macro-reify-eval-vs-value/Test_2.scala b/test/pending/run/macro-reify-eval-vs-value/Test_2.scala
deleted file mode 100644
index 8e62e6e0e7..0000000000
--- a/test/pending/run/macro-reify-eval-vs-value/Test_2.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-object Test extends App {
-  Macros.fooEval({ println("in ur logz"); "world"})
-  println("======================")
-  Macros.fooValue({ println("i can has cheezburger?"); "world"})
-}
\ No newline at end of file
diff --git a/test/pending/run/macro-reify-groundtypetag-hktypeparams-tags/Test.scala b/test/pending/run/macro-reify-groundtypetag-hktypeparams-tags/Test.scala
index ef70a66f1a..6c1461af8d 100644
--- a/test/pending/run/macro-reify-groundtypetag-hktypeparams-tags/Test.scala
+++ b/test/pending/run/macro-reify-groundtypetag-hktypeparams-tags/Test.scala
@@ -1,4 +1,4 @@
-import scala.reflect.mirror._
+import scala.reflect.runtime.universe._
 
 object Test extends App {
   def fooTypeTagHK[C[_]: ConcreteTypeTag, T: ConcreteTypeTag] = {
diff --git a/test/pending/run/macro-reify-tagful-b/Macros_1.scala b/test/pending/run/macro-reify-tagful-b/Macros_1.scala
index 38b839330b..04cf46d3a5 100644
--- a/test/pending/run/macro-reify-tagful-b/Macros_1.scala
+++ b/test/pending/run/macro-reify-tagful-b/Macros_1.scala
@@ -5,7 +5,7 @@ object Macros {
 
   object Impls {
     def foo[T: c.TypeTag](c: Ctx)(s: c.Expr[T]) = c.reify {
-      List(s.eval)
+      List(s.splice)
     }
   }
 }
\ No newline at end of file
diff --git a/test/pending/run/macro-reify-tagless-b/Impls_Macros_1.scala b/test/pending/run/macro-reify-tagless-b/Impls_Macros_1.scala
index fac7ba5b98..04366353eb 100644
--- a/test/pending/run/macro-reify-tagless-b/Impls_Macros_1.scala
+++ b/test/pending/run/macro-reify-tagless-b/Impls_Macros_1.scala
@@ -5,7 +5,7 @@ object Macros {
 
   object Impls {
     def foo[T](c: Ctx)(s: c.Expr[T]) = c.reify {
-      List(s.eval)
+      List(s.splice)
     }
   }
 }
\ No newline at end of file
diff --git a/test/pending/run/macro-reify-tagless-b/Test_2.scala b/test/pending/run/macro-reify-tagless-b/Test_2.scala
index 419ee42101..4649963d05 100644
--- a/test/pending/run/macro-reify-tagless-b/Test_2.scala
+++ b/test/pending/run/macro-reify-tagless-b/Test_2.scala
@@ -2,10 +2,12 @@ object Test extends App {
   //val list: List[String] = Macros.foo("hello world")
   //println(list)
 
-  import scala.reflect.mirror._
+  import scala.reflect.runtime.universe._
+  import scala.reflect.runtime.{currentMirror => cm}
+  import scala.tools.reflect.ToolBox
   val tpt = AppliedTypeTree(Ident(definitions.ListClass), List(Ident(definitions.StringClass)))
   val rhs = Apply(Select(Ident("Macros"), newTermName("foo")), List(Literal(Constant("hello world"))))
   val list = ValDef(NoMods, newTermName("list"), tpt, rhs)
   val tree = Block(list, Apply(Select(Ident(definitions.PredefModule), newTermName("println")), List(Ident(list.name))))
-  println(tree.eval)
+  println(cm.mkToolBox().runExpr(tree))
 }
diff --git a/test/pending/run/macro-reify-typetag-hktypeparams-notags/Test.scala b/test/pending/run/macro-reify-typetag-hktypeparams-notags/Test.scala
index 9a370189a7..c7b1cedcd2 100644
--- a/test/pending/run/macro-reify-typetag-hktypeparams-notags/Test.scala
+++ b/test/pending/run/macro-reify-typetag-hktypeparams-notags/Test.scala
@@ -1,4 +1,4 @@
-import scala.reflect.mirror._
+import scala.reflect.runtime.universe._
 
 object Test extends App {
   def fooNoTypeTagHK[C[_], T] = {
diff --git a/test/pending/run/macro-reify-typetag-hktypeparams-tags/Test.scala b/test/pending/run/macro-reify-typetag-hktypeparams-tags/Test.scala
index 0358da9b0d..3252423375 100644
--- a/test/pending/run/macro-reify-typetag-hktypeparams-tags/Test.scala
+++ b/test/pending/run/macro-reify-typetag-hktypeparams-tags/Test.scala
@@ -1,4 +1,4 @@
-import scala.reflect.mirror._
+import scala.reflect.runtime.universe._
 
 object Test extends App {
   def fooTypeTagHK[C[_]: TypeTag, T: TypeTag] = {
diff --git a/test/pending/run/reify_addressbook.scala b/test/pending/run/reify_addressbook.scala
index 7cb6dc08fd..d53a0f7bc0 100644
--- a/test/pending/run/reify_addressbook.scala
+++ b/test/pending/run/reify_addressbook.scala
@@ -1,4 +1,5 @@
-import scala.reflect.mirror._
+import scala.reflect.runtime.universe._
+import scala.tools.reflect.Eval
 
 object Test extends App {
   reify {
diff --git a/test/pending/run/reify_brainf_ck.scala b/test/pending/run/reify_brainf_ck.scala
index e4bcb257bd..2af3bca1c7 100644
--- a/test/pending/run/reify_brainf_ck.scala
+++ b/test/pending/run/reify_brainf_ck.scala
@@ -1,4 +1,5 @@
-import scala.reflect.mirror._
+import scala.reflect.runtime.universe._
+import scala.tools.reflect.Eval
 
 object Test extends App {
   reify {
diff --git a/test/pending/run/reify_callccinterpreter.scala b/test/pending/run/reify_callccinterpreter.scala
index 0e23f75dcc..d9f7736769 100644
--- a/test/pending/run/reify_callccinterpreter.scala
+++ b/test/pending/run/reify_callccinterpreter.scala
@@ -1,4 +1,5 @@
-import scala.reflect.mirror._
+import scala.reflect.runtime.universe._
+import scala.tools.reflect.Eval
 
 object Test extends App {
   reify {
diff --git a/test/pending/run/reify_closure2b.scala b/test/pending/run/reify_closure2b.scala
index f9ed16d309..565bb03b2f 100644
--- a/test/pending/run/reify_closure2b.scala
+++ b/test/pending/run/reify_closure2b.scala
@@ -1,16 +1,21 @@
+import scala.reflect.runtime.universe._
+import scala.reflect.runtime.{universe => ru}
+import scala.reflect.runtime.{currentMirror => cm}
+import scala.tools.reflect.ToolBox
+
 object Test extends App {
   def foo(y: Int): Int => Int = {
     class Foo(y: Int) {
-      val fun = reflect.mirror.reify{(x: Int) => {
+      val fun = reify{(x: Int) => {
         x + y
       }}
     }
 
-    val toolbox = mkToolBox()
+    val toolbox = cm.mkToolBox()
     val dyn = toolbox.runExpr(new Foo(y).fun.tree)
     dyn.asInstanceOf[Int => Int]
   }
 
   println(foo(1)(10))
   println(foo(2)(10))
-}
+}
\ No newline at end of file
diff --git a/test/pending/run/reify_closure3b.scala b/test/pending/run/reify_closure3b.scala
index 8ef0a60c66..0d806b148b 100644
--- a/test/pending/run/reify_closure3b.scala
+++ b/test/pending/run/reify_closure3b.scala
@@ -1,18 +1,23 @@
+import scala.reflect.runtime.universe._
+import scala.reflect.runtime.{universe => ru}
+import scala.reflect.runtime.{currentMirror => cm}
+import scala.tools.reflect.ToolBox
+
 object Test extends App {
   def foo(y: Int): Int => Int = {
     class Foo(y: Int) {
       def y1 = y
 
-      val fun = reflect.mirror.reify{(x: Int) => {
+      val fun = reify{(x: Int) => {
         x + y1
       }}
     }
 
-    val toolbox = mkToolBox()
+    val toolbox = cm.mkToolBox()
     val dyn = toolbox.runExpr(new Foo(y).fun.tree)
     dyn.asInstanceOf[Int => Int]
   }
 
   println(foo(1)(10))
   println(foo(2)(10))
-}
+}
\ No newline at end of file
diff --git a/test/pending/run/reify_closure4b.scala b/test/pending/run/reify_closure4b.scala
index 9eeb01b459..1a349de072 100644
--- a/test/pending/run/reify_closure4b.scala
+++ b/test/pending/run/reify_closure4b.scala
@@ -1,18 +1,23 @@
+import scala.reflect.runtime.universe._
+import scala.reflect.runtime.{universe => ru}
+import scala.reflect.runtime.{currentMirror => cm}
+import scala.tools.reflect.ToolBox
+
 object Test extends App {
   def foo(y: Int): Int => Int = {
     class Foo(y: Int) {
       val y1 = y
 
-      val fun = reflect.mirror.reify{(x: Int) => {
+      val fun = reify{(x: Int) => {
         x + y1
       }}
     }
 
-    val toolbox = mkToolBox()
+    val toolbox = cm.mkToolBox()
     val dyn = toolbox.runExpr(new Foo(y).fun.tree)
     dyn.asInstanceOf[Int => Int]
   }
 
   println(foo(1)(10))
   println(foo(2)(10))
-}
+}
\ No newline at end of file
diff --git a/test/pending/run/reify_closure5b.scala b/test/pending/run/reify_closure5b.scala
index 51f1ec318d..3e5e1bd328 100644
--- a/test/pending/run/reify_closure5b.scala
+++ b/test/pending/run/reify_closure5b.scala
@@ -1,16 +1,21 @@
+import scala.reflect.runtime.universe._
+import scala.reflect.runtime.{universe => ru}
+import scala.reflect.runtime.{currentMirror => cm}
+import scala.tools.reflect.ToolBox
+
 object Test extends App {
   def foo[T](ys: List[T]): Int => Int = {
     class Foo[T](ys: List[T]) {
-      val fun = reflect.mirror.reify{(x: Int) => {
+      val fun = reify{(x: Int) => {
         x + ys.length
       }}
     }
 
-    val toolbox = mkToolBox()
+    val toolbox = cm.mkToolBox()
     val dyn = toolbox.runExpr(new Foo(ys).fun.tree)
     dyn.asInstanceOf[Int => Int]
   }
 
   println(foo(List(1, 2, 3))(10))
   println(foo(List(1, 2, 3, 4))(10))
-}
+}
\ No newline at end of file
diff --git a/test/pending/run/reify_closure9a.scala b/test/pending/run/reify_closure9a.scala
index 1fc18cfa13..dddfa3f6c2 100644
--- a/test/pending/run/reify_closure9a.scala
+++ b/test/pending/run/reify_closure9a.scala
@@ -1,14 +1,18 @@
-import scala.reflect.mirror._
+import scala.reflect.runtime.universe._
+import scala.reflect.runtime.{universe => ru}
+import scala.reflect.runtime.{currentMirror => cm}
+import scala.tools.reflect.ToolBox
+
 object Test extends App {
   def foo(y: Int) = {
     class Foo(val y: Int) {
       def fun = reify{y}
     }
 
-    val toolbox = mkToolBox()
+    val toolbox = cm.mkToolBox()
     val dyn = toolbox.runExpr(new Foo(y).fun.tree)
     dyn.asInstanceOf[Int]
   }
 
   println(foo(10))
-}
+}
\ No newline at end of file
diff --git a/test/pending/run/reify_closure9b.scala b/test/pending/run/reify_closure9b.scala
index 32b05d00ee..df9db9b806 100644
--- a/test/pending/run/reify_closure9b.scala
+++ b/test/pending/run/reify_closure9b.scala
@@ -1,14 +1,18 @@
-import scala.reflect.mirror._
+import scala.reflect.runtime.universe._
+import scala.reflect.runtime.{universe => ru}
+import scala.reflect.runtime.{currentMirror => cm}
+import scala.tools.reflect.ToolBox
+
 object Test extends App {
   def foo(y: Int) = {
     class Foo(y: Int) {
       def fun = reify{y}
     }
 
-    val toolbox = mkToolBox()
+    val toolbox = cm.mkToolBox()
     val dyn = toolbox.runExpr(new Foo(y).fun.tree)
     dyn.asInstanceOf[Int]
   }
 
   println(foo(10))
-}
+}
\ No newline at end of file
diff --git a/test/pending/run/reify_closures11.scala b/test/pending/run/reify_closures11.scala
index ceb224c6d6..4c21033cbc 100644
--- a/test/pending/run/reify_closures11.scala
+++ b/test/pending/run/reify_closures11.scala
@@ -1,12 +1,16 @@
-import scala.reflect.mirror._
+import scala.reflect.runtime.universe._
+import scala.reflect.runtime.{universe => ru}
+import scala.reflect.runtime.{currentMirror => cm}
+import scala.tools.reflect.ToolBox
+
 object Test extends App {
   def fun() = {
     def z() = 2
     reify{z}
   }
 
-  val toolbox = mkToolBox()
+  val toolbox = cm.mkToolBox()
   val dyn = toolbox.runExpr(fun().tree)
   val foo = dyn.asInstanceOf[Int]
   println(foo)
-}
+}
\ No newline at end of file
diff --git a/test/pending/run/reify_gadts.scala b/test/pending/run/reify_gadts.scala
index 652a7d99d8..582c0802f7 100644
--- a/test/pending/run/reify_gadts.scala
+++ b/test/pending/run/reify_gadts.scala
@@ -1,4 +1,5 @@
-import scala.reflect.mirror._
+import scala.reflect.runtime.universe._
+import scala.tools.reflect.Eval
 
 object Test extends App {
   reify {
diff --git a/test/pending/run/reify_newimpl_07.scala b/test/pending/run/reify_newimpl_07.scala
index 13ca6bda8b..b6886b8bb7 100644
--- a/test/pending/run/reify_newimpl_07.scala
+++ b/test/pending/run/reify_newimpl_07.scala
@@ -1,10 +1,11 @@
-import scala.reflect.mirror._
+import scala.reflect.runtime.universe._
+import scala.tools.reflect.Eval
 
 object Test extends App {
   {
     class C(val y: Int) {
       val code = reify {
-        reify{y}.eval
+        reify{y}.splice
       }
     }
 
diff --git a/test/pending/run/reify_newimpl_08.scala b/test/pending/run/reify_newimpl_08.scala
index e2faa3c9af..6caa33f30d 100644
--- a/test/pending/run/reify_newimpl_08.scala
+++ b/test/pending/run/reify_newimpl_08.scala
@@ -1,14 +1,15 @@
-import scala.reflect.mirror._
+import scala.reflect.runtime.universe._
+import scala.tools.reflect.Eval
 
 object Test extends App {
   val code = reify {
     class C(val y: Int) {
       val code = reify {
-        reify{y}.eval
+        reify{y}.splice
       }
     }
 
-    new C(2).code.eval
+    new C(2).code.splice
   }
 
   println(code.eval)
diff --git a/test/pending/run/reify_newimpl_35.scala b/test/pending/run/reify_newimpl_35.scala
deleted file mode 100644
index 5e1d163e9e..0000000000
--- a/test/pending/run/reify_newimpl_35.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-import scala.tools.partest.ReplTest
-
-object Test extends ReplTest {
-  override def extraSettings = "-Xlog-free-types"
-  def code = """
-import scala.reflect.mirror._
-def foo[T: TypeTag] = reify{List[T]()}
-println(foo)
-  """
-}
diff --git a/test/pending/run/reify_newimpl_46.scala b/test/pending/run/reify_newimpl_46.scala
index 840d695e83..239c53953b 100644
--- a/test/pending/run/reify_newimpl_46.scala
+++ b/test/pending/run/reify_newimpl_46.scala
@@ -1,11 +1,14 @@
-import scala.reflect.mirror._
+import scala.reflect.runtime.universe._
+import scala.reflect.runtime.{universe => ru}
+import scala.reflect.runtime.{currentMirror => cm}
+import scala.tools.reflect.ToolBox
 
 object Test extends App {
   class C[T[_] >: Null] {
-    val code = reify{val x: T[String] = null; println("ima worx"); x}
-    println(freeTypes(code))
-    val T = freeTypes(code)(0)
-    mkToolBox().runExpr(code, Map(T -> definitions.ListClass.asType))
+    val code = reify{val x: T[String] = null; println("ima worx"); x}.tree
+    println(code.freeTypes)
+    val T = code.freeTypes(0)
+    cm.mkToolBox().runExpr(code, Map(T -> definitions.ListClass.asType))
   }
 
   new C[List]
diff --git a/test/pending/run/reify_newimpl_53.scala b/test/pending/run/reify_newimpl_53.scala
index 26645dea6a..a73a0b94cb 100644
--- a/test/pending/run/reify_newimpl_53.scala
+++ b/test/pending/run/reify_newimpl_53.scala
@@ -1,14 +1,17 @@
-import scala.reflect.mirror._
+import scala.reflect.runtime.universe._
+import scala.reflect.runtime.{universe => ru}
+import scala.reflect.runtime.{currentMirror => cm}
+import scala.tools.reflect.ToolBox
 
 object Test extends App {
   class C[T >: Null] {
     val code = reify{
       val tt = implicitly[TypeTag[T]]
       println("mah typetag is: %s".format(tt))
-    }
-    println(freeTypes(code))
-    val T = freeTypes(code)(0)
-    mkToolBox().runExpr(code, Map(T -> definitions.StringClass.asType))
+    }.tree
+    println(code.freeTypes)
+    val T = code.freeTypes(0)
+    cm.mkToolBox().runExpr(code, Map(T -> definitions.StringClass.asType))
   }
 
   new C[String]
diff --git a/test/pending/run/reify_simpleinterpreter.scala b/test/pending/run/reify_simpleinterpreter.scala
index 2193edeea7..6cf87ea7c5 100644
--- a/test/pending/run/reify_simpleinterpreter.scala
+++ b/test/pending/run/reify_simpleinterpreter.scala
@@ -1,4 +1,4 @@
-import scala.reflect.mirror._
+import scala.reflect.runtime.universe._
 
 object Test extends App {
   reify {
diff --git a/test/pending/run/t5256c.check b/test/pending/run/t5256c.check
deleted file mode 100644
index e69de29bb2..0000000000
--- a/test/pending/run/t5256c.check
+++ /dev/null
diff --git a/test/pending/run/t5256c.scala b/test/pending/run/t5256c.scala
deleted file mode 100644
index 8ebb51a009..0000000000
--- a/test/pending/run/t5256c.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-import scala.reflect.mirror._
-
-object Test extends App {
-  {
-    class A
-    val c = classToType(classOf[A])
-    println(c)
-    println(c.typeSymbol == classToSymbol(classOf[A]))
-  }
-}
diff --git a/test/pending/run/t5256g.check b/test/pending/run/t5256g.check
deleted file mode 100644
index e69de29bb2..0000000000
--- a/test/pending/run/t5256g.check
+++ /dev/null
diff --git a/test/pending/run/t5256g.scala b/test/pending/run/t5256g.scala
deleted file mode 100644
index 6158a9281d..0000000000
--- a/test/pending/run/t5256g.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-import scala.reflect.mirror._
-
-class A
-trait B
-
-object Test extends App {
-  val mutant = new A with B
-  val c = classToType(mutant.getClass)
-  println(c)
-  println(c.typeSymbol == classToSymbol(mutant.getClass))
-}
diff --git a/test/pending/run/t5256h.check b/test/pending/run/t5256h.check
deleted file mode 100644
index 4f9b8faf71..0000000000
--- a/test/pending/run/t5256h.check
+++ /dev/null
@@ -1,8 +0,0 @@
-import scala.reflect.mirror._
-
-object Test extends App {
-  val mutant = new { val x = 2 }
-  val c = classToType(mutant.getClass)
-  println(c)
-  println(c.typeSymbol == classToSymbol(mutant.getClass))
-}
diff --git a/test/pending/run/t5256h.scala b/test/pending/run/t5256h.scala
deleted file mode 100644
index 4f9b8faf71..0000000000
--- a/test/pending/run/t5256h.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-import scala.reflect.mirror._
-
-object Test extends App {
-  val mutant = new { val x = 2 }
-  val c = classToType(mutant.getClass)
-  println(c)
-  println(c.typeSymbol == classToSymbol(mutant.getClass))
-}
diff --git a/test/pending/run/t5258b.scala b/test/pending/run/t5258b.scala
index 82555cde96..a280513d59 100644
--- a/test/pending/run/t5258b.scala
+++ b/test/pending/run/t5258b.scala
@@ -1,4 +1,5 @@
-import scala.reflect.mirror._
+import scala.reflect.runtime.universe._
+import scala.tools.reflect.Eval
 
 object Test extends App {
   reify {
diff --git a/test/pending/run/t5258c.scala b/test/pending/run/t5258c.scala
index a0a1647486..4a656690ba 100644
--- a/test/pending/run/t5258c.scala
+++ b/test/pending/run/t5258c.scala
@@ -1,4 +1,5 @@
-import scala.reflect.mirror._
+import scala.reflect.runtime.universe._
+import scala.tools.reflect.Eval
 
 object Test extends App {
   reify {
diff --git a/test/pending/run/t5418.scala b/test/pending/run/t5418.scala
index 9b0a954e47..e3cb20cf82 100644
--- a/test/pending/run/t5418.scala
+++ b/test/pending/run/t5418.scala
@@ -1,4 +1,5 @@
-import scala.reflect.mirror._
+import scala.reflect.runtime.universe._
+import scala.tools.reflect.Eval
 
 object Test extends App {
   reify {
diff --git a/test/pending/run/t5427a.scala b/test/pending/run/t5427a.scala
index 27b28da0ac..f7cd05158d 100644
--- a/test/pending/run/t5427a.scala
+++ b/test/pending/run/t5427a.scala
@@ -1,4 +1,4 @@
-import scala.reflect.mirror._
+import scala.reflect.runtime.universe._
 
 object Foo { val bar = 2 }
 
diff --git a/test/pending/run/t5427b.scala b/test/pending/run/t5427b.scala
index 7a92b6ebbe..e80bd12369 100644
--- a/test/pending/run/t5427b.scala
+++ b/test/pending/run/t5427b.scala
@@ -1,4 +1,4 @@
-import scala.reflect.mirror._
+import scala.reflect.runtime.universe._
 
 class Foo { val bar = 2 }
 
diff --git a/test/pending/run/t5427c.scala b/test/pending/run/t5427c.scala
index ab41d8b8cd..7095158e85 100644
--- a/test/pending/run/t5427c.scala
+++ b/test/pending/run/t5427c.scala
@@ -1,4 +1,4 @@
-import scala.reflect.mirror._
+import scala.reflect.runtime.universe._
 
 class Foo(bar: Int)
 
diff --git a/test/pending/run/t5427d.scala b/test/pending/run/t5427d.scala
index fd4c62e876..f0cc07d27e 100644
--- a/test/pending/run/t5427d.scala
+++ b/test/pending/run/t5427d.scala
@@ -1,4 +1,4 @@
-import scala.reflect.mirror._
+import scala.reflect.runtime.universe._
 
 class Foo(val bar: Int)
 
diff --git a/test/pending/shootout/meteor.scala b/test/pending/shootout/meteor.scala
index 154695533b..6dbd3cf459 100644
--- a/test/pending/shootout/meteor.scala
+++ b/test/pending/shootout/meteor.scala
@@ -1,3 +1,5 @@
+import scala.reflect.{ClassTag, classTag}
+
 /* The Computer Language Shootout
    http://shootout.alioth.debian.org/
    contributed by Isaac Gouy
@@ -493,4 +495,3 @@ final class PieceCell extends Cell {
 
 
 
-