scala · nicolasstucki · Sep 19, 2019
diff --git a/community-build/community-projects/minitest b/community-build/community-projects/minitest
diff --git a/community-build/community-projects/scalatest b/community-build/community-projects/scalatest
diff --git a/community-build/community-projects/shapeless b/community-build/community-projects/shapeless
diff --git a/community-build/community-projects/sourcecode b/community-build/community-projects/sourcecode
diff --git a/community-build/community-projects/xml-interpolator b/community-build/community-projects/xml-interpolator
diff --git a/compiler/test-resources/repl-macros/i5551 b/compiler/test-resources/repl-macros/i5551
@@ -1,4 +1,4 @@
-scala> import scala.quoted._
+scala> import scala.quoted.{_, given}
 scala> def assertImpl(expr: Expr[Boolean])(given qctx: QuoteContext) = '{ if !($expr) then throw new AssertionError("failed assertion")}
 def assertImpl
   (expr: quoted.Expr[Boolean])

diff --git a/docs/docs/reference/metaprogramming/macros.md b/docs/docs/reference/metaprogramming/macros.md
@@ -31,7 +31,7 @@ a boolean expression tree as argument. `assertImpl` evaluates the expression and
 prints it again in an error message if it evaluates to `false`.
 
 ```scala
-    import scala.quoted._
+    import scala.quoted.{_, given}
 
     inline def assert(expr: => Boolean): Unit =
       ${ assertImpl('expr) }
@@ -205,7 +205,7 @@ phase-correct. If that was not the case, the phase inconsistency for
 Consider the following implementation of a staged interpreter that implements
 a compiler through staging.
 ```scala
-    import scala.quoted._
+    import scala.quoted.{_, given}
 
     enum Exp {
       case Num(n: Int)
@@ -224,7 +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 given scala.quoted._
+    import scala.quoted.{_, given}
 
     def compile(e: Exp, env: Map[String, Expr[Int]]): Expr[Int] = e match {
       case Num(n) =>

diff --git a/docs/docs/reference/metaprogramming/tasty-reflect.md b/docs/docs/reference/metaprogramming/tasty-reflect.md
@@ -24,7 +24,7 @@ parameter of type `scala.quoted.QuoteContext` and import `tasty._` from it in
 the scope where it is used.
 
 ```scala
-import scala.quoted._
+import scala.quoted.{_, given}
 
 inline def natConst(x: => Int): Int = ${natConstImpl('{x})}
 

diff --git a/library/src-bootstrapped/dotty/internal/StringContextMacro.scala b/library/src-bootstrapped/dotty/internal/StringContextMacro.scala
@@ -2,7 +2,7 @@
 
 package dotty.internal
 
-import scala.quoted._
+import scala.quoted.{_, given}
 import scala.quoted.matching._
 import reflect._
 

diff --git a/library/src-bootstrapped/scala/compiletime/testing/package.scala b/library/src-bootstrapped/scala/compiletime/testing/package.scala
@@ -1,6 +1,6 @@
 package scala.compiletime
 
-import scala.quoted._
+import scala.quoted.{_, given}
 
 package object testing {
 

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](given Liftable[T], QuoteContext): Conversion[T, Expr[T]] = _.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] = summon[Liftable[T]].toExpr(x)
 
    /** Lifts this sequence of expressions into an expression of a sequence

diff --git a/library/src-non-bootstrapped/dotty/internal/StringContextMacro.scala b/library/src-non-bootstrapped/dotty/internal/StringContextMacro.scala
@@ -2,7 +2,7 @@
 
 package dotty.internal
 
-import scala.quoted._
+import scala.quoted.{_, given}
 import scala.quoted.matching._
 import reflect._
 

diff --git a/library/src/scala/internal/Quoted.scala b/library/src/scala/internal/Quoted.scala
@@ -1,7 +1,7 @@
 package scala.internal
 
 import scala.annotation.{Annotation, compileTimeOnly}
-import scala.quoted._
+import scala.quoted.{_, given}
 
 object Quoted {
 

diff --git a/library/src/scala/internal/quoted/Expr.scala b/library/src/scala/internal/quoted/Expr.scala
@@ -1,6 +1,6 @@
 package scala.internal.quoted
 
-import scala.quoted._
+import scala.quoted.{_, given}
 
 object Expr {
 

diff --git a/library/src/scala/internal/quoted/Matcher.scala b/library/src/scala/internal/quoted/Matcher.scala
@@ -2,7 +2,7 @@ package scala.internal.quoted
 
 import scala.annotation.internal.sharable
 
-import scala.quoted._
+import scala.quoted.{_, given}
 import scala.quoted.matching.Bind
 
 private[quoted] object Matcher {

diff --git a/library/src/scala/internal/quoted/Type.scala b/library/src/scala/internal/quoted/Type.scala
@@ -1,6 +1,6 @@
 package scala.internal.quoted
 
-import scala.quoted._
+import scala.quoted.{_, given}
 
 object Type {
 

diff --git a/sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/src/main/scala/hello/Hello.scala b/sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/src/main/scala/hello/Hello.scala
@@ -1,7 +1,7 @@
 package hello
 
 // Import `Expr` and some extension methods
-import scala.quoted._
+import scala.quoted.{_, given}
 import scala.quoted.staging.{run, Toolbox}
 
 object Main {

diff --git a/sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/src/test/scala/hello/Tests.scala b/sbt-dotty/sbt-test/sbt-dotty/quoted-example-project/src/test/scala/hello/Tests.scala
@@ -3,7 +3,7 @@ package hello
 import org.junit.Test
 
 // Import Expr and some extension methods
-import scala.quoted._
+import scala.quoted.{_, given}
 
 class Tests {
 

diff --git a/staging/src/scala/quoted/staging/QuoteDriver.scala b/staging/src/scala/quoted/staging/QuoteDriver.scala
@@ -8,7 +8,7 @@ import dotty.tools.dotc.tastyreflect.ReflectionImpl
 import dotty.tools.io.{AbstractFile, Directory, PlainDirectory, VirtualDirectory}
 import dotty.tools.repl.AbstractFileClassLoader
 import dotty.tools.dotc.reporting._
-import scala.quoted._
+import scala.quoted.{_, given}
 import scala.quoted.staging.Toolbox
 import java.net.URLClassLoader
 

diff --git a/staging/test-resources/repl-staging/i6007 b/staging/test-resources/repl-staging/i6007
@@ -1,4 +1,4 @@
-scala> import scala.quoted._
+scala> import scala.quoted.{_, given}
 scala> import scala.quoted.staging._
 scala> implicit def toolbox: Toolbox = Toolbox.make(getClass.getClassLoader)
 def toolbox: quoted.staging.Toolbox

diff --git a/tests/disabled/neg-with-compiler/quote-run-in-macro-2/quoted_1.scala b/tests/disabled/neg-with-compiler/quote-run-in-macro-2/quoted_1.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 import scala.quoted.autolift.given
 
 object Macros {

diff --git a/tests/disabled/pos/quote-whitebox/Macro_1.scala b/tests/disabled/pos/quote-whitebox/Macro_1.scala
@@ -1,5 +1,5 @@
 
-import scala.quoted._
+import scala.quoted.{_, given}
 
 object Macro {
 

diff --git a/tests/disabled/run/i4803d/Macro_1.scala b/tests/disabled/run/i4803d/Macro_1.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 
 object PowerMacro {
   def powerCode(x: Expr[Double], n: Long): Expr[Double] =

diff --git a/tests/disabled/run/xml-interpolation-3/XmlQuote_1.scala b/tests/disabled/run/xml-interpolation-3/XmlQuote_1.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 import scala.tasty.Tasty
 import scala.quoted.autolift.given
 

diff --git a/tests/neg-macros/delegate-match-1/Macro_1.scala b/tests/neg-macros/delegate-match-1/Macro_1.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 import scala.quoted.matching._
 
 inline def f: Any = ${ fImpl }

diff --git a/tests/neg-macros/delegate-match-2/Macro_1.scala b/tests/neg-macros/delegate-match-2/Macro_1.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 import scala.quoted.matching._
 
 inline def f: Any = ${ fImpl }

diff --git a/tests/neg-macros/delegate-match-3/Macro_1.scala b/tests/neg-macros/delegate-match-3/Macro_1.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 import scala.quoted.matching._
 
 inline def f: Any = ${ fImpl }

diff --git a/tests/neg-macros/i6432/Macro_1.scala b/tests/neg-macros/i6432/Macro_1.scala
@@ -1,5 +1,5 @@
 
-import scala.quoted._
+import scala.quoted.{_, given}
 import scala.quoted.autolift.given
 import scala.quoted.matching._
 

diff --git a/tests/neg-macros/i6432b/Macro_1.scala b/tests/neg-macros/i6432b/Macro_1.scala
@@ -1,5 +1,5 @@
 
-import scala.quoted._
+import scala.quoted.{_, given}
 import scala.quoted.autolift.given
 import scala.quoted.matching._
 

diff --git a/tests/neg-macros/i6976/Macro_1.scala b/tests/neg-macros/i6976/Macro_1.scala
@@ -1,6 +1,6 @@
 package playground
 
-import scala.quoted._, scala.quoted.matching._
+import scala.quoted.{_, given}, scala.quoted.matching._
 import scala.quoted.given
 import scala.tasty._
 

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,5 @@
 
-import scala.quoted._
+import scala.quoted.{_, given}
 
 object Macros {
   def impl(foo: Any)(given QuoteContext): Expr[String] = foo.getClass.getCanonicalName.toExpr

diff --git a/tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala b/tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala
@@ -1,5 +1,5 @@
 
-import scala.quoted._
+import scala.quoted.{_, given}
 import scala.quoted.autolift.given
 
 object E {

diff --git a/tests/neg-macros/inline-option/Macro_1.scala b/tests/neg-macros/inline-option/Macro_1.scala
@@ -1,5 +1,5 @@
 
-import scala.quoted._
+import scala.quoted.{_, given}
 
 object Macro {
   def impl(opt: Option[Int])(given QuoteContext): Expr[Int] = opt match {

diff --git a/tests/neg-macros/inline-tuples-1/Macro_1.scala b/tests/neg-macros/inline-tuples-1/Macro_1.scala
@@ -1,5 +1,5 @@
 
-import scala.quoted._
+import scala.quoted.{_, given}
 import scala.quoted.autolift.given
 
 object Macros {

diff --git a/tests/neg-macros/macros-in-same-project-1/Foo.scala b/tests/neg-macros/macros-in-same-project-1/Foo.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 
 object Foo {
 

diff --git a/tests/neg-macros/macros-in-same-project-2/Foo.scala b/tests/neg-macros/macros-in-same-project-2/Foo.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 
 object Foo {
 

diff --git a/tests/neg-macros/macros-in-same-project-3/Bar.scala b/tests/neg-macros/macros-in-same-project-3/Bar.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 
 object Bar {
 

diff --git a/tests/neg-macros/macros-in-same-project-3/Foo.scala b/tests/neg-macros/macros-in-same-project-3/Foo.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 
 object Foo {
 

diff --git a/tests/neg-macros/macros-in-same-project-4/Bar.scala b/tests/neg-macros/macros-in-same-project-4/Bar.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 
 object Bar {
 

diff --git a/tests/neg-macros/macros-in-same-project-4/Foo.scala b/tests/neg-macros/macros-in-same-project-4/Foo.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 
 object Foo {
 

diff --git a/tests/neg-macros/quote-complex-top-splice.scala b/tests/neg-macros/quote-complex-top-splice.scala
@@ -1,6 +1,6 @@
 import Test.impl
 
-import scala.quoted._
+import scala.quoted.{_, given}
 
 object Test {
 

diff --git a/tests/neg-macros/quote-interpolator-core-old.scala b/tests/neg-macros/quote-interpolator-core-old.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 import scala.quoted.autolift.given
 
 // This test checks the correct interpretation of the inlined value class

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,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 
 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-macros/quote-macro-splice.scala b/tests/neg-macros/quote-macro-splice.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 import scala.quoted.autolift.given
 
 object Test {

diff --git a/tests/neg-macros/quote-pcp-in-arg.scala b/tests/neg-macros/quote-pcp-in-arg.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 
 object Foo {
   inline def foo(x: Int): Int = ${ bar('{ 'x; x }) } // error

diff --git a/tests/neg-macros/quote-splice-interpret-1.scala b/tests/neg-macros/quote-splice-interpret-1.scala
@@ -1,5 +1,5 @@
 
-import scala.quoted._
+import scala.quoted.{_, given}
 
 object Macros {
   inline def isZero(inline n: Int): Boolean = ${

diff --git a/tests/neg-macros/quote-this-b.scala b/tests/neg-macros/quote-this-b.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 
 class Foo {
   inline def k(): Unit = ${ Foo.impl[Any](this) } // error

diff --git a/tests/neg-macros/quote-this.scala b/tests/neg-macros/quote-this.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 
 class Foo {
 

diff --git a/tests/neg-macros/quote-whitebox/Macro_1.scala b/tests/neg-macros/quote-whitebox/Macro_1.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 
 object Macros {
   inline def defaultOf(inline str: String) <: Any = ${ defaultOfImpl(str) }

diff --git a/tests/neg-macros/splice-in-top-level-splice-1.scala b/tests/neg-macros/splice-in-top-level-splice-1.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 import scala.quoted.autolift.given
 
 object Foo {

diff --git a/tests/neg-macros/splice-in-top-level-splice-2.scala b/tests/neg-macros/splice-in-top-level-splice-2.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 
 object Foo {
   inline def foo(): Int = ${$x} // error

diff --git a/tests/neg-macros/tasty-macro-assert-1/quoted_1.scala b/tests/neg-macros/tasty-macro-assert-1/quoted_1.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 
 object Asserts {
 

diff --git a/tests/neg-macros/tasty-macro-assert-2/quoted_1.scala b/tests/neg-macros/tasty-macro-assert-2/quoted_1.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 
 object Asserts {
 

diff --git a/tests/neg-macros/tasty-macro-error/quoted_1.scala b/tests/neg-macros/tasty-macro-error/quoted_1.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 
 object Macros {
 

diff --git a/tests/neg-macros/tasty-macro-positions/quoted_1.scala b/tests/neg-macros/tasty-macro-positions/quoted_1.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 
 object Macros {
 

diff --git a/tests/neg-macros/tasty-string-interpolator-position-a/Macro_1.scala b/tests/neg-macros/tasty-string-interpolator-position-a/Macro_1.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 import scala.language.implicitConversions
 
 object Macro {

diff --git a/tests/neg-macros/tasty-string-interpolator-position-b/Macro_1.scala b/tests/neg-macros/tasty-string-interpolator-position-b/Macro_1.scala
@@ -1,4 +1,4 @@
-import scala.quoted._
+import scala.quoted.{_, given}
 import scala.language.implicitConversions
 
 object Macro {
+1 −1		common-test.dotty/src/main/scala/org/scalatest/LineNumberHelper.scala
+7 −7		project/GenAnyVals.scala
+1 −1		project/GenFactoriesDotty.scala
+1 −1		scalactic.dotty/src/main/scala/org/scalactic/BooleanMacro.scala
+1 −1		scalactic.dotty/src/main/scala/org/scalactic/Requirements.scala
+1 −1		scalactic.dotty/src/main/scala/org/scalactic/Snapshots.scala
+1 −1		scalactic.dotty/src/main/scala/org/scalactic/anyvals/CompileTimeAssertions.scala
+1 −1		scalactic.dotty/src/main/scala/org/scalactic/anyvals/NumericStringMacro.scala
+1 −1		scalactic.dotty/src/main/scala/org/scalactic/anyvals/PercentageIntMacros.scala
+1 −1		scalactic.dotty/src/main/scala/org/scalactic/anyvals/RegexStringMacro.scala
+1 −1		scalactic.dotty/src/main/scala/org/scalactic/source/Position.scala
+1 −1		scalactic.dotty/src/main/scala/org/scalactic/source/TypeInfo.scala
+1 −1		scalactic.dotty/src/main/scala/org/scalactic/source/TypeInfoMacro.scala
+2 −2		scalatest.dotty/src/main/scala/org/scalatest/Assertions.scala
+1 −1		scalatest.dotty/src/main/scala/org/scalatest/AssertionsMacro.scala
+1 −1		scalatest.dotty/src/main/scala/org/scalatest/CompileMacro.scala
+1 −1		scalatest.dotty/src/main/scala/org/scalatest/DiagrammedAssertionsMacro.scala
+1 −1		scalatest.dotty/src/main/scala/org/scalatest/diagrams/Diagrams.scala
+1 −1		scalatest.dotty/src/main/scala/org/scalatest/diagrams/DiagramsMacro.scala
+1 −1		scalatest.dotty/src/main/scala/org/scalatest/expectations/ExpectationsMacro.scala
+1 −1		scalatest.dotty/src/main/scala/org/scalatest/matchers/MatchPatternMacro.scala
+1 −1		scalatest.dotty/src/main/scala/org/scalatest/matchers/TypeMatcherMacro.scala
+1 −1		core/src/main/scala/shapeless/annotation.scala
+1 −1		core/src/main/scala/shapeless/reflectionutils.scala
+1 −1		core/src/main/scala/shapeless/test/package.scala
+1 −1		core/src/main/scala/shapeless/typeable.scala
+1 −1		src/main/scala/dotty/xml/interpolator/internal/Expand.scala
+1 −1		src/main/scala/dotty/xml/interpolator/internal/Macro.scala
+1 −1		src/main/scala/dotty/xml/interpolator/internal/Reporter.scala
+1 −1		src/main/scala/dotty/xml/interpolator/internal/TypeCheck.scala
+1 −1		src/main/scala/dotty/xml/interpolator/internal/XmlContext.scala
+1 −1		src/main/scala/dotty/xml/interpolator/package.scala