Remove Toolbox.Default

It is impossible ensure that the correct classloader is used.

Author: nicolasstucki

community-build/community-projects/sourcecode

@@ -1,4 +1,5 @@
-scala> import quoted.Toolbox.Default._
+scala> implicit def toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make
+def toolbox: quoted.Toolbox
 scala> val v = '{ (if true then Some(1) else None).map(v => v+1) }
 val v: quoted.Expr[Option[Int]] = Expr(<pickled tasty>)
 scala> v.show

compiler/test-resources/repl/i6007

@@ -2,7 +2,7 @@ package scala.quoted
 
 import scala.annotation.implicitNotFound
 
-@implicitNotFound("Could not find implicit quoted.Toolbox.\n\nDefault toolbox can be instantiated with:\n  `implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make`\n\nIf only needed once it can also be imported with:\n `import scala.quoted.Toolbox.Default._`")
+@implicitNotFound("Could not find implicit quoted.Toolbox.\n\nDefault toolbox can be instantiated with:\n  `implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make`\n\n")
 trait Toolbox {
   def run[T](expr: Expr[T]): T
   def show[T](expr: Expr[T]): String
@@ -11,11 +11,6 @@ trait Toolbox {
 
 object Toolbox {
 
-  object Default {
-    // TODO remove? It may be better to only have one way to instantiate the toolbox
-    implicit def make(implicit settings: Settings): Toolbox = Toolbox.make
-  }
-
   /** Create a new instance of the toolbox.
     *
     * This instance of the toolbox tries to recover the classloader of the application based on

library/src/scala/quoted/Toolbox.scala

@@ -15,7 +15,7 @@ object Lens {
   def impl[S: Type, T: Type](getter: Expr[S => T])(implicit refl: Reflection): Expr[Lens[S, T]] = {
     import refl._
     import util._
-    import quoted.Toolbox.Default._
+    implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make
 
     // obj.copy(field = value)
     def setterBody(obj: Expr[S], value: Expr[T], field: String): Expr[S] =

tests/neg-with-compiler/i5941/macro_1.scala

@@ -1,9 +1,10 @@
 import scala.quoted._
 import scala.quoted.autolift._
 
-import scala.quoted.Toolbox.Default._
-
 object Macros {
+
+  implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make
+
   inline def foo(i: => Int): Int = ${ fooImpl('i) }
   def fooImpl(i: Expr[Int]): Expr[Int] = {
     val y: Int = i.run

tests/neg-with-compiler/quote-run-in-macro-1/quoted_1.scala

@@ -1,10 +1,11 @@
 import scala.quoted._
 import scala.quoted.autolift._
-import scala.quoted.Toolbox.Default._
 
 object Macros {
+
   inline def foo(i: => Int): Int = ${ fooImpl('i) }
   def fooImpl(i: Expr[Int]): Expr[Int] = {
+    implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make
     val y: Int = i.run
     y
   }

tests/neg-with-compiler/quote-run-in-macro-2/quoted_1.scala

@@ -2,7 +2,6 @@ import scala.quoted._
 import scala.tasty.Reflection
 import scala.language.implicitConversions
 import scala.quoted.Exprs.LiftedExpr
-import scala.quoted.Toolbox.Default._
 
 object Macro {
 
@@ -14,6 +13,7 @@ object FIntepolator {
 
   def apply(strCtxExpr: Expr[StringContext], argsExpr: Expr[Seq[Any]])(implicit reflect: Reflection): Expr[String] = {
     import reflect._
+    implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make
     error("there are no parts", strCtxExpr.unseal.underlyingArgument.pos)
     '{ ($strCtxExpr).s($argsExpr: _*) }
   }

tests/neg/tasty-string-interpolator-position-a/Macro_1.scala

@@ -2,7 +2,6 @@ import scala.quoted._
 import scala.tasty.Reflection
 import scala.language.implicitConversions
 import scala.quoted.Exprs.LiftedExpr
-import scala.quoted.Toolbox.Default._
 
 object Macro {
 
@@ -11,6 +10,7 @@ object Macro {
 }
 
 object FIntepolator {
+  implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make
 
   def apply(strCtxExpr: Expr[StringContext], argsExpr: Expr[Seq[Any]])(implicit reflect: Reflection): Expr[String] = {
     import reflect._

tests/neg/tasty-string-interpolator-position-b/Macro_1.scala

@@ -1,8 +1,6 @@
 import scala.quoted._
 import scala.quoted.autolift._
 
-import scala.quoted.Toolbox.Default._
-
 object Macros {
 
 
@@ -41,5 +39,7 @@ class Test {
     ${ powerCode(3, '{math.sqrt(2.0)}) }
   }
 
+  implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make
+
   program.run
 }

tests/pos-with-compiler/quote-0.scala

@@ -1,4 +1,4 @@
-import scala.quoted.Toolbox.Default._
+
 import scala.quoted._
 import Macros._
 
@@ -15,5 +15,7 @@ object Test {
     ${ assertImpl('{x != 0}) }
   }
 
+  implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make
+
   program.run
 }