Merge branch 'master' of https://github.com/scala/scala into wip-sip14-fixes

1 files changed, 3 insertions, 9 deletions

diff --git a/test/files/run/t5277_1.scala b/test/files/run/t5277_1.scala
index 0aaec7cdf2..f95e9ab6ec 100644
--- a/test/files/run/t5277_1.scala
+++ b/test/files/run/t5277_1.scala
@@ -1,9 +1,7 @@
-import scala.tools.nsc.reporters._
-import scala.tools.nsc.Settings
-import reflect.runtime.Mirror.ToolBox
+import scala.reflect.mirror._
 
 object Test extends App {
-  val code = scala.reflect.Code.lift{
+  reify {
     def fact(n: Int): BigInt =
       if (n == 0) 1 else fact(n-1) * n
     class Factorizer(n: Int) {
@@ -12,9 +10,5 @@ object Test extends App {
     implicit def int2fact(n: Int) = new Factorizer(n)
 
     println("10! = " + (10!))
-  };
-
-  val reporter = new ConsoleReporter(new Settings)
-  val toolbox = new ToolBox(reporter)
-  toolbox.runExpr(code.tree)
+  }.eval
 }