Rename quoted.Runner to quoted.Toolbox

nicolasstucki · nicolasstucki · commit c165dd2875a0 · 2018-02-26T22:17:51.000+01:00
diff --git a/compiler/src/dotty/tools/dotc/quoted/QuoteDriver.scala b/compiler/src/dotty/tools/dotc/quoted/QuoteDriver.scala
@@ -11,7 +11,7 @@ import scala.quoted.Expr
 
 import java.net.URLClassLoader
 
-import Runners.{Settings, Run, Show}
+import Toolbox.{Settings, Run, Show}
 
 class QuoteDriver extends Driver {
   import tpd._
diff --git a/compiler/src/dotty/tools/dotc/quoted/Toolbox.scala b/compiler/src/dotty/tools/dotc/quoted/Toolbox.scala
@@ -11,17 +11,17 @@ import scala.quoted.Exprs.ValueExpr
 import scala.runtime.quoted._
 
 /** Default runners for quoted expressions */
-object Runners {
+object Toolbox {
   import tpd._
 
   type Run
   type Show
 
-  implicit def runner[T]: Runner[T] = new Runner[T] {
+  implicit def toolbox[T]: Toolbox[T] = new Toolbox[T] {
 
-    def run(expr: Expr[T]): T = Runners.run(expr, Settings.run())
+    def run(expr: Expr[T]): T = Toolbox.run(expr, Settings.run())
 
-    def show(expr: Expr[T]): String = Runners.show(expr, Settings.show())
+    def show(expr: Expr[T]): String = Toolbox.show(expr, Settings.show())
 
     def toConstantOpt(expr: Expr[T]): Option[T] = {
       def toConstantOpt(tree: Tree): Option[T] = tree match {
diff --git a/library/src/scala/quoted/Constant.scala b/library/src/scala/quoted/Constant.scala
@@ -1,7 +1,7 @@
 package scala.quoted
 
-import scala.runtime.quoted.Runner
+import scala.runtime.quoted.Toolbox
 
 object Constant {
-  def unapply[T](expr: Expr[T])(implicit runner: Runner[T]): Option[T] = runner.toConstantOpt(expr)
+  def unapply[T](expr: Expr[T])(implicit runner: Toolbox[T]): Option[T] = runner.toConstantOpt(expr)
 }
diff --git a/library/src/scala/quoted/Expr.scala b/library/src/scala/quoted/Expr.scala
@@ -1,12 +1,12 @@
 package scala.quoted
 
-import scala.runtime.quoted.Runner
+import scala.runtime.quoted.Toolbox
 import scala.runtime.quoted.Unpickler.Pickled
 
 sealed abstract class Expr[T] {
   final def unary_~ : T = throw new Error("~ should have been compiled away")
-  final def run(implicit runner: Runner[T]): T = runner.run(this)
-  final def show(implicit runner: Runner[T]): String = runner.show(this)
+  final def run(implicit toolbox: Toolbox[T]): T = toolbox.run(this)
+  final def show(implicit toolbox: Toolbox[T]): String = toolbox.show(this)
 }
 
 object Expr {
diff --git a/library/src/scala/runtime/quoted/Toolbox.scala b/library/src/scala/runtime/quoted/Toolbox.scala
@@ -3,8 +3,8 @@ package scala.runtime.quoted
 import scala.annotation.implicitNotFound
 import scala.quoted.Expr
 
-@implicitNotFound("Could not find implicit Runner. Default runner can be imported with `import dotty.tools.dotc.quoted.Runners._`")
-trait Runner[T] {
+@implicitNotFound("Could not find implicit Toolbox. Default runner can be imported with `import dotty.tools.dotc.quoted.Toolbox._`")
+trait Toolbox[T] {
   def run(expr: Expr[T]): T
   def show(expr: Expr[T]): String
   def toConstantOpt(expr: Expr[T]): Option[T]
diff --git a/tests/pending/run-with-compiler/quote-run-constants-extract.scala b/tests/pending/run-with-compiler/quote-run-constants-extract.scala
@@ -1,6 +1,6 @@
 import scala.quoted._
 
-import dotty.tools.dotc.quoted.Runners._
+import dotty.tools.dotc.quoted.Toolbox._
 
 object Test {
 
diff --git a/tests/pending/run-with-compiler/quote-run-large.scala b/tests/pending/run-with-compiler/quote-run-large.scala
@@ -1,4 +1,4 @@
-import dotty.tools.dotc.quoted.Runners._
+import dotty.tools.dotc.quoted.Toolbox._
 
 import scala.quoted.TastyExpr
 
diff --git a/tests/pos/quote-0.scala b/tests/pos/quote-0.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import dotty.tools.dotc.quoted.Runners._
+import dotty.tools.dotc.quoted.Toolbox._
 
 class Test {
 
diff --git a/tests/pos/quote-assert/quoted_2.scala b/tests/pos/quote-assert/quoted_2.scala
@@ -1,4 +1,4 @@
-import dotty.tools.dotc.quoted.Runners.runner
+import dotty.tools.dotc.quoted.Toolbox._
 import scala.quoted._
 import Macros._
 
diff --git a/tests/run-with-compiler/i3823-b.scala b/tests/run-with-compiler/i3823-b.scala
@@ -1,4 +1,4 @@
-import dotty.tools.dotc.quoted.Runners._
+import dotty.tools.dotc.quoted.Toolbox._
 import scala.quoted._
 object Test {
   def main(args: Array[String]): Unit = {
diff --git a/tests/run-with-compiler/i3823-c.scala b/tests/run-with-compiler/i3823-c.scala
@@ -1,4 +1,4 @@
-import dotty.tools.dotc.quoted.Runners._
+import dotty.tools.dotc.quoted.Toolbox._
 import scala.quoted._
 object Test {
   def main(args: Array[String]): Unit = {
diff --git a/tests/run-with-compiler/i3823.scala b/tests/run-with-compiler/i3823.scala
@@ -1,4 +1,4 @@
-import dotty.tools.dotc.quoted.Runners._
+import dotty.tools.dotc.quoted.Toolbox._
 import scala.quoted._
 object Test {
   def main(args: Array[String]): Unit = {
diff --git a/tests/run-with-compiler/i3876-b.scala b/tests/run-with-compiler/i3876-b.scala
@@ -1,4 +1,4 @@
-import dotty.tools.dotc.quoted.Runners._
+import dotty.tools.dotc.quoted.Toolbox._
 import scala.quoted._
 object Test {
   def main(args: Array[String]): Unit = {
diff --git a/tests/run-with-compiler/i3876-c.scala b/tests/run-with-compiler/i3876-c.scala
@@ -1,4 +1,4 @@
-import dotty.tools.dotc.quoted.Runners._
+import dotty.tools.dotc.quoted.Toolbox._
 import scala.quoted._
 object Test {
   def main(args: Array[String]): Unit = {
diff --git a/tests/run-with-compiler/i3876-d.scala b/tests/run-with-compiler/i3876-d.scala
@@ -1,4 +1,4 @@
-import dotty.tools.dotc.quoted.Runners._
+import dotty.tools.dotc.quoted.Toolbox._
 import scala.quoted._
 object Test {
   def main(args: Array[String]): Unit = {
diff --git a/tests/run-with-compiler/i3876.scala b/tests/run-with-compiler/i3876.scala
@@ -1,4 +1,4 @@
-import dotty.tools.dotc.quoted.Runners._
+import dotty.tools.dotc.quoted.Toolbox._
 import scala.quoted._
 object Test {
   def main(args: Array[String]): Unit = {
diff --git a/tests/run-with-compiler/i3946.scala b/tests/run-with-compiler/i3946.scala
@@ -1,4 +1,4 @@
-import dotty.tools.dotc.quoted.Runners._
+import dotty.tools.dotc.quoted.Toolbox._
 import scala.quoted._
 object Test {
   def main(args: Array[String]): Unit = {
diff --git a/tests/run-with-compiler/quote-lib.scala b/tests/run-with-compiler/quote-lib.scala
@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import dotty.tools.dotc.quoted.Runners._
+import dotty.tools.dotc.quoted.Toolbox._
 
 import liftable.Units._
 import liftable.Lets._
diff --git a/tests/run-with-compiler/quote-run-2.scala b/tests/run-with-compiler/quote-run-2.scala
@@ -1,5 +1,5 @@
 
-import dotty.tools.dotc.quoted.Runners._
+import dotty.tools.dotc.quoted.Toolbox._
 
 import scala.quoted._
 
diff --git a/tests/run-with-compiler/quote-run-b.scala b/tests/run-with-compiler/quote-run-b.scala
@@ -1,5 +1,5 @@
 
-import dotty.tools.dotc.quoted.Runners._
+import dotty.tools.dotc.quoted.Toolbox._
 
 import scala.quoted._
 
diff --git a/tests/run-with-compiler/quote-run-c.scala b/tests/run-with-compiler/quote-run-c.scala
@@ -1,5 +1,5 @@
 
-import dotty.tools.dotc.quoted.Runners._
+import dotty.tools.dotc.quoted.Toolbox._
 
 import scala.quoted._
 
diff --git a/tests/run-with-compiler/quote-run-constants.scala b/tests/run-with-compiler/quote-run-constants.scala
@@ -1,5 +1,5 @@
 
-import dotty.tools.dotc.quoted.Runners._
+import dotty.tools.dotc.quoted.Toolbox._
 
 import scala.quoted._
 
diff --git a/tests/run-with-compiler/quote-run-staged-interpreter.scala b/tests/run-with-compiler/quote-run-staged-interpreter.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-import dotty.tools.dotc.quoted.Runners._
+import dotty.tools.dotc.quoted.Toolbox._
 
 enum Exp {
   case Num(n: Int)
diff --git a/tests/run-with-compiler/quote-run-with-settings.scala b/tests/run-with-compiler/quote-run-with-settings.scala
@@ -1,7 +1,7 @@
 
 import java.nio.file.{Files, Paths}
 
-import dotty.tools.dotc.quoted.Runners._
+import dotty.tools.dotc.quoted.Toolbox._
 
 import scala.quoted._
 
diff --git a/tests/run-with-compiler/quote-run.scala b/tests/run-with-compiler/quote-run.scala
@@ -1,5 +1,5 @@
 
-import dotty.tools.dotc.quoted.Runners._
+import dotty.tools.dotc.quoted.Toolbox._
 
 import scala.quoted._
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package scala.quoted`
`2`	`2`
`3`		`-import scala.runtime.quoted.Runner`
	`3`	`+import scala.runtime.quoted.Toolbox`
`4`	`4`
`5`	`5`	`object Constant {`
`6`		`- def unapply[T](expr: Expr[T])(implicit runner: Runner[T]): Option[T] = runner.toConstantOpt(expr)`
	`6`	`+ def unapply[T](expr: Expr[T])(implicit runner: Toolbox[T]): Option[T] = runner.toConstantOpt(expr)`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import dotty.tools.dotc.quoted.Runners._`
	`1`	`+import dotty.tools.dotc.quoted.Toolbox._`
`2`	`2`
`3`	`3`	`import scala.quoted.TastyExpr`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`
`2`		`-import dotty.tools.dotc.quoted.Runners._`
	`2`	`+import dotty.tools.dotc.quoted.Toolbox._`
`3`	`3`
`4`	`4`	`import scala.quoted._`
`5`	`5`