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

1 files changed, 4 insertions, 7 deletions

diff --git a/test/files/run/reify_printf.scala b/test/files/run/reify_printf.scala
index cd6052bc5e..dc092c1a85 100644
--- a/test/files/run/reify_printf.scala
+++ b/test/files/run/reify_printf.scala
@@ -1,19 +1,15 @@
 import java.io.{ ByteArrayOutputStream, PrintStream }
-import scala.reflect.Code
 import scala.reflect.mirror._
 import scala.reflect.api._
 import scala.reflect.api.Trees
 import scala.reflect.internal.Types
-import reflect.runtime.Mirror.ToolBox
-import scala.tools.nsc.reporters._
-import scala.tools.nsc.Settings
 import scala.util.matching.Regex
 
 object Test extends App {
-  val tree = tree_printf(Code.lift("hello %s").tree, Code.lift("world").tree)
+  val tree = tree_printf(reify("hello %s").tree, reify("world").tree)
 
-  val reporter = new ConsoleReporter(new Settings)
-  val toolbox = new ToolBox(reporter, args mkString " ")
+  import scala.reflect.mirror._
+  val toolbox = mkToolBox()
 
   val output = new ByteArrayOutputStream()
   Console.setOut(new PrintStream(output))
@@ -22,6 +18,7 @@ object Test extends App {
   assert(output.toString() == "hello world", output.toString() +" ==     hello world")
 
   /*
+  // upd. Oh, good old times, our very-very first experiments with macros :)
   macro def printf(format: String, params: Any*) : String = tree_printf(format: Tree, (params: Seq[Tree]): _*)
    */