Use given instead of implicit for scala.quoted.ExprOps

nicolasstucki · nicolasstucki · commit 399d8fe932cb · 2019-09-06T17:14:34.000+02:00
diff --git a/.gitmodules b/.gitmodules
@@ -42,8 +42,7 @@
 	url = https://github.com/dotty-staging/scala-xml
 [submodule "community-build/community-projects/shapeless"]
 	path = community-build/community-projects/shapeless
-	url = https://github.com/milessabin/shapeless
-	branch = shapeless-3
+	url = https://github.com/dotty-staging/shapeless
 [submodule "community-build/community-projects/xml-interpolator"]
 	path = community-build/community-projects/xml-interpolator
 	url = https://github.com/lampepfl/xml-interpolator.git
diff --git a/community-build/community-projects/minitest b/community-build/community-projects/minitest
@@ -1 +1 @@
-Subproject commit eaddd4dde4b8a84ddf62a20a781b939a135b3ea1
+Subproject commit e77ef15b5160df1239ba31e118262b37f72aab2b
diff --git a/community-build/community-projects/scalatest b/community-build/community-projects/scalatest
@@ -1 +1 @@
-Subproject commit 46da553e3d0800410b62114a244c427e5fc24c76
+Subproject commit fcb5e585ff79e6947863b5cf2cbafd922c36d5c4
diff --git a/community-build/community-projects/shapeless b/community-build/community-projects/shapeless
@@ -1 +1 @@
-Subproject commit ab34097be4a47138dd10e5c816ce7173a793375d
+Subproject commit d6315fb75684813fb44842c048b31385e125a75a
diff --git a/community-build/community-projects/sourcecode b/community-build/community-projects/sourcecode
@@ -1 +1 @@
-Subproject commit b23462bbaf3781e27fd54970a76b265cb2ae7e71
+Subproject commit 5cb4de46fe076ad25614b96590953db27caf5b56
diff --git a/community-build/community-projects/xml-interpolator b/community-build/community-projects/xml-interpolator
@@ -1 +1 @@
-Subproject commit ce42d5bf7d00239aedf3bbf9d7ad8319216d9391
+Subproject commit 4952ae212090ca864dd3c717027a0863419af228
diff --git a/docs/docs/reference/metaprogramming/macros.md b/docs/docs/reference/metaprogramming/macros.md
@@ -224,6 +224,7 @@ Here’s a compiler that maps an expression given in the interpreted
 language to quoted Scala code of type `Expr[Int]`.
 The compiler takes an environment that maps variable names to Scala `Expr`s.
 ```scala
+    import scala.quoted._
     import given scala.quoted._
 
     def compile(e: Exp, env: Map[String, Expr[Int]]): Expr[Int] = e match {
diff --git a/library/src-bootstrapped/dotty/internal/StringContextMacro.scala b/library/src-bootstrapped/dotty/internal/StringContextMacro.scala
@@ -3,6 +3,7 @@
 package dotty.internal
 
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.matching._
 import reflect._
 
diff --git a/library/src-bootstrapped/scala/quoted/package.scala b/library/src-bootstrapped/scala/quoted/package.scala
@@ -6,7 +6,9 @@ package object quoted {
     given autoToExpr[T] as Conversion[T, Expr[T]] given Liftable[T], QuoteContext = _.toExpr
   }
 
-  implicit object ExprOps {
+  given ExprOps {
+
+    /** Lift a value into an expression containing the construction of that value */
     def (x: T) toExpr[T: Liftable] given QuoteContext: Expr[T] = the[Liftable[T]].toExpr(x)
 
    /** Lifts this sequence of expressions into an expression of a sequence
diff --git a/tests/neg-macros/inline-case-objects/Macro_1.scala b/tests/neg-macros/inline-case-objects/Macro_1.scala
@@ -1,5 +1,6 @@
 
 import scala.quoted._
+import given scala.quoted._
 
 object Macros {
   def impl(foo: Any) given QuoteContext: Expr[String] = foo.getClass.getCanonicalName.toExpr
diff --git a/tests/neg-macros/inline-option/Macro_1.scala b/tests/neg-macros/inline-option/Macro_1.scala
@@ -1,5 +1,6 @@
 
 import scala.quoted._
+import given scala.quoted._
 
 object Macro {
   def impl(opt: Option[Int]) given QuoteContext: Expr[Int] = opt match {
diff --git a/tests/neg-macros/quote-macro-complex-arg-0.scala b/tests/neg-macros/quote-macro-complex-arg-0.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 
 object Macros {
   inline def foo(inline i: Int, dummy: Int, j: Int): Int = ${ bar(i + 1, 'j) } // error: i + 1 is not a parameter or field reference
diff --git a/tests/neg-with-compiler/GenericNumLits/Even_1.scala b/tests/neg-with-compiler/GenericNumLits/Even_1.scala
@@ -1,5 +1,6 @@
 import scala.util.FromDigits
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.matching._
 
 case class Even(n: Int)
diff --git a/tests/neg/BigFloat/BigFloat_1.scala b/tests/neg/BigFloat/BigFloat_1.scala
@@ -1,6 +1,7 @@
 package test
 import scala.util.FromDigits
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.matching._
 
 case class BigFloat(mantissa: BigInt, exponent: Int) {
diff --git a/tests/neg/GenericNumLits/Even_1.scala b/tests/neg/GenericNumLits/Even_1.scala
@@ -1,5 +1,6 @@
 import scala.util.FromDigits
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.matching._
 
 case class Even(n: Int)
diff --git a/tests/pos-macros/quote-whitebox-2/Macro_1.scala b/tests/pos-macros/quote-whitebox-2/Macro_1.scala
@@ -1,5 +1,6 @@
 
 import scala.quoted._
+import given scala.quoted._
 
 object Macro {
 
diff --git a/tests/pos/i5547.scala b/tests/pos/i5547.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 
 object scalatest {
   inline def assert1(condition: => Boolean): Unit =
diff --git a/tests/pos/i6214.scala b/tests/pos/i6214.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 object Test {
   def res(x: quoted.Expr[Int]) given QuoteContext: quoted.Expr[Int] = x match {
     case '{ val a: Int = $y; 1} => y                     // owner of `y` is `res`
diff --git a/tests/pos/quote-lift.scala b/tests/pos/quote-lift.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 
 object Test {
    given as QuoteContext = ???
diff --git a/tests/pos/quote-liftable.scala b/tests/pos/quote-liftable.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 
 def test given QuoteContext = {
 
diff --git a/tests/run-custom-args/Yretain-trees/tasty-load-tree-1/quoted_1.scala b/tests/run-custom-args/Yretain-trees/tasty-load-tree-1/quoted_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-
+import given scala.quoted._
 
 object Foo {
 
diff --git a/tests/run-custom-args/Yretain-trees/tasty-load-tree-2/quoted_1.scala b/tests/run-custom-args/Yretain-trees/tasty-load-tree-2/quoted_1.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 
 object Foo {
 
diff --git a/tests/run-macros/f-interpolator-neg/Macros_1.scala b/tests/run-macros/f-interpolator-neg/Macros_1.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 import given scala.quoted.autolift._
 import scala.quoted.matching._
 
diff --git a/tests/run-macros/gestalt-type-toolbox-reflect/Macro_1.scala b/tests/run-macros/gestalt-type-toolbox-reflect/Macro_1.scala
@@ -2,6 +2,7 @@
 // using staging reflection
 
 import scala.quoted._
+import given scala.quoted._
 
 object TypeToolbox {
   /** are the two types equal? */
diff --git a/tests/run-macros/i5629/Macro_1.scala b/tests/run-macros/i5629/Macro_1.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 
 object Macros {
 
diff --git a/tests/run-macros/inline-case-objects/Macro_1.scala b/tests/run-macros/inline-case-objects/Macro_1.scala
@@ -1,5 +1,6 @@
 
 import scala.quoted._
+import given scala.quoted._
 
 object Macros {
   def impl(foo: Any) given QuoteContext: Expr[String] = foo.getClass.getCanonicalName.toExpr
diff --git a/tests/run-macros/inline-macro-staged-interpreter/Macro_1.scala b/tests/run-macros/inline-macro-staged-interpreter/Macro_1.scala
@@ -1,5 +1,6 @@
 
 import scala.quoted._
+import given scala.quoted._
 
 object E {
 
diff --git a/tests/run-macros/quote-matcher-runtime/quoted_1.scala b/tests/run-macros/quote-matcher-runtime/quoted_1.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.matching._
 
 
diff --git a/tests/run-macros/quote-matcher-string-interpolator-2/quoted_1.scala b/tests/run-macros/quote-matcher-string-interpolator-2/quoted_1.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.matching._
 
 
diff --git a/tests/run-macros/quote-matcher-string-interpolator-3/quoted_1.scala b/tests/run-macros/quote-matcher-string-interpolator-3/quoted_1.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.matching._
 
 
diff --git a/tests/run-macros/quote-matcher-string-interpolator/quoted_1.scala b/tests/run-macros/quote-matcher-string-interpolator/quoted_1.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.matching._
 
 
diff --git a/tests/run-macros/quote-matcher-symantics-1/quoted_1.scala b/tests/run-macros/quote-matcher-symantics-1/quoted_1.scala
@@ -1,5 +1,6 @@
 
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.matching._
 
 object Macros {
diff --git a/tests/run-macros/quote-matcher-symantics-2/quoted_1.scala b/tests/run-macros/quote-matcher-symantics-2/quoted_1.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.matching._
 
 object Macros {
diff --git a/tests/run-macros/quote-matcher-symantics-3/quoted_1.scala b/tests/run-macros/quote-matcher-symantics-3/quoted_1.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.matching._
 
 object Macros {
diff --git a/tests/run-macros/quote-toExprOfTuple/Macro_1.scala b/tests/run-macros/quote-toExprOfTuple/Macro_1.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 
 object Macro {
   inline def t2[T0, T1](t0: T0, t1: T1): (T0, T1) = ${ impl2('{t0}, '{t1}) }
diff --git a/tests/run-macros/reflect-inline/assert_1.scala b/tests/run-macros/reflect-inline/assert_1.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 
 object api {
   inline def (inline x: String) stripMargin: String =
diff --git a/tests/run-macros/reflect-isFunctionType/macro_1.scala b/tests/run-macros/reflect-isFunctionType/macro_1.scala
@@ -1,5 +1,5 @@
 import scala.quoted._
-
+import given scala.quoted._
 
 inline def isFunctionType[T:Type]: Boolean = ${ isFunctionTypeImpl('[T]) }
 
@@ -30,4 +30,3 @@ def isDependentFunctionTypeImpl[T](tp: Type[T]) given (qctx: QuoteContext): Expr
   import qctx.tasty._
   tp.unseal.tpe.isDependentFunctionType.toExpr
 }
-
diff --git a/tests/run-macros/reflect-typeChecks/assert_1.scala b/tests/run-macros/reflect-typeChecks/assert_1.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 
 object scalatest {
 
diff --git a/tests/run-macros/tasty-dealias/quoted_1.scala b/tests/run-macros/tasty-dealias/quoted_1.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 
 object Macros {
 
diff --git a/tests/run-macros/tasty-extractors-constants-1/quoted_1.scala b/tests/run-macros/tasty-extractors-constants-1/quoted_1.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 import given scala.quoted.autolift._
 
 import scala.quoted.matching._
diff --git a/tests/run-macros/tasty-interpolation-1/Macro.scala b/tests/run-macros/tasty-interpolation-1/Macro.scala
@@ -1,5 +1,6 @@
 
 import scala.quoted._
+import given scala.quoted._
 import scala.language.implicitConversions
 import given scala.quoted.autolift._
 
diff --git a/tests/run-macros/tasty-macro-positions/quoted_1.scala b/tests/run-macros/tasty-macro-positions/quoted_1.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 
 object Macros {
 
diff --git a/tests/run-macros/tasty-simplified/quoted_1.scala b/tests/run-macros/tasty-simplified/quoted_1.scala
@@ -1,5 +1,6 @@
 import scala.annotation.tailrec
 import scala.quoted._
+import given scala.quoted._
 
 object Macros {
 
diff --git a/tests/run-macros/tasty-string-interpolation-reporter-test/Macros_1.scala b/tests/run-macros/tasty-string-interpolation-reporter-test/Macros_1.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 import given scala.quoted.autolift._
 import scala.quoted.matching._
 
diff --git a/tests/run-macros/type-show/Macro_1.scala b/tests/run-macros/type-show/Macro_1.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 
 object TypeToolbox {
   inline def show[A]: String = ${ showImpl('[A]) }
diff --git a/tests/run-macros/xml-interpolation-2/XmlQuote_1.scala b/tests/run-macros/xml-interpolation-2/XmlQuote_1.scala
@@ -1,5 +1,6 @@
 
 import scala.quoted._
+import given scala.quoted._
 import given scala.quoted.autolift._
 
 
diff --git a/tests/run-staging/i3847-b.scala b/tests/run-staging/i3847-b.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.staging._
 import scala.reflect.ClassTag
 
diff --git a/tests/run-staging/i3847.scala b/tests/run-staging/i3847.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.staging._
 import scala.reflect.ClassTag
 
diff --git a/tests/run-staging/i3947.scala b/tests/run-staging/i3947.scala
@@ -1,5 +1,6 @@
 
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.staging._
 
 object Test {
diff --git a/tests/run-staging/i3947b.scala b/tests/run-staging/i3947b.scala
@@ -1,5 +1,6 @@
 
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.staging._
 
 object Test {
diff --git a/tests/run-staging/i3947b2.scala b/tests/run-staging/i3947b2.scala
@@ -1,5 +1,6 @@
 
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.staging._
 
 object Test {
diff --git a/tests/run-staging/i3947b3.scala b/tests/run-staging/i3947b3.scala
@@ -1,5 +1,6 @@
 
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.staging._
 
 object Test {
diff --git a/tests/run-staging/i3947c.scala b/tests/run-staging/i3947c.scala
@@ -1,5 +1,6 @@
 
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.staging._
 
 object Test {
diff --git a/tests/run-staging/i3947d.scala b/tests/run-staging/i3947d.scala
@@ -1,5 +1,6 @@
 
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.staging._
 object Test {
   delegate for Toolbox = Toolbox.make(getClass.getClassLoader)
diff --git a/tests/run-staging/i3947d2.scala b/tests/run-staging/i3947d2.scala
@@ -1,5 +1,6 @@
 
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.staging._
 
 object Test {
diff --git a/tests/run-staging/i3947e.scala b/tests/run-staging/i3947e.scala
@@ -1,5 +1,6 @@
 
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.staging._
 
 object Test {
diff --git a/tests/run-staging/i3947f.scala b/tests/run-staging/i3947f.scala
@@ -1,5 +1,6 @@
 
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.staging._
 
 object Test {
diff --git a/tests/run-staging/i3947g.scala b/tests/run-staging/i3947g.scala
@@ -1,5 +1,6 @@
 
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.staging._
 
 object Test {
diff --git a/tests/run-staging/i3947i.scala b/tests/run-staging/i3947i.scala
@@ -1,5 +1,6 @@
 
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.staging._
 
 object Test {
diff --git a/tests/run-staging/i3947j.scala b/tests/run-staging/i3947j.scala
@@ -1,5 +1,6 @@
 
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.staging._
 
 object Test {
diff --git a/tests/run-staging/i4730.scala b/tests/run-staging/i4730.scala
@@ -1,4 +1,5 @@
 import scala.quoted._
+import given scala.quoted._
 import scala.quoted.staging._
 
 object Test {
diff --git a/tests/run-staging/i5161.scala b/tests/run-staging/i5161.scala
diff --git a/tests/run-staging/quote-lift-BigDecimal.scala b/tests/run-staging/quote-lift-BigDecimal.scala
diff --git a/tests/run-staging/quote-lift-BigInt.scala b/tests/run-staging/quote-lift-BigInt.scala
diff --git a/tests/run-staging/quote-macro-in-splice/quoted_2.scala b/tests/run-staging/quote-macro-in-splice/quoted_2.scala
diff --git a/tests/run-staging/quote-toExprOfTuple.scala b/tests/run-staging/quote-toExprOfTuple.scala
diff --git a/tests/run-staging/shonan-hmm-simple.scala b/tests/run-staging/shonan-hmm-simple.scala
diff --git a/tests/run-staging/shonan-hmm/Complex.scala b/tests/run-staging/shonan-hmm/Complex.scala
diff --git a/tests/run-staging/shonan-hmm/PV.scala b/tests/run-staging/shonan-hmm/PV.scala
diff --git a/tests/run-staging/staged-tuples/StagedTuple.scala b/tests/run-staging/staged-tuples/StagedTuple.scala
diff --git a/tests/run-with-compiler/BigFloat/BigFloat_1.scala b/tests/run-with-compiler/BigFloat/BigFloat_1.scala
diff --git a/tests/run-with-compiler/i6201/macro_1.scala b/tests/run-with-compiler/i6201/macro_1.scala
diff --git a/tests/run-with-compiler/i6270/Macro_1.scala b/tests/run-with-compiler/i6270/Macro_1.scala
diff --git a/tests/run-with-compiler/reflect-sourceCode/Macro_1.scala b/tests/run-with-compiler/reflect-sourceCode/Macro_1.scala

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,9 @@ package object quoted {`
`6`	`6`	`given autoToExpr[T] as Conversion[T, Expr[T]] given Liftable[T], QuoteContext = _.toExpr`
`7`	`7`	`}`
`8`	`8`
`9`		`- implicit object ExprOps {`
	`9`	`+ given ExprOps {`
	`10`	`+`
	`11`	`+ /** Lift a value into an expression containing the construction of that value */`
`10`	`12`	`def (x: T) toExpr[T: Liftable] given QuoteContext: Expr[T] = the[Liftable[T]].toExpr(x)`
`11`	`13`
`12`	`14`	`/** Lifts this sequence of expressions into an expression of a sequence`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import scala.quoted._`
	`2`	`+import given scala.quoted._`
`2`	`3`
`3`	`4`	`object Macros {`
`4`	`5`	`inline def foo(inline i: Int, dummy: Int, j: Int): Int = ${ bar(i + 1, 'j) } // error: i + 1 is not a parameter or field reference`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`
`2`	`2`	`import scala.quoted._`
	`3`	`+import given scala.quoted._`
`3`	`4`
`4`	`5`	`object Macro {`
`5`	`6`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import scala.quoted._`
`2`		`-`
	`2`	`+import given scala.quoted._`
`3`	`3`
`4`	`4`	`inline def isFunctionType[T:Type]: Boolean = ${ isFunctionTypeImpl('[T]) }`
`5`	`5`
`@@ -30,4 +30,3 @@ def isDependentFunctionTypeImpl[T](tp: Type[T]) given (qctx: QuoteContext): Expr`
`30`	`30`	`import qctx.tasty._`
`31`	`31`	`tp.unseal.tpe.isDependentFunctionType.toExpr`
`32`	`32`	`}`
`33`		`-`