Merge pull request #8917 from dotty-staging/remove-deprectated-quoted-matching-package

anatoliykmetyuk · web-flow · commit 3b8a756c4823 · 2020-05-11T10:48:22.000+02:00
Remove depreciated quoted.matching package
diff --git a/community-build/community-projects/dotty-cps-async b/community-build/community-projects/dotty-cps-async
@@ -1 +1 @@
-Subproject commit a9777a7b1b2e04c4ac51e7b763244f69fcd91837
+Subproject commit 5637c2fe2c87520eab2f0629c0796a78e10e3929
diff --git a/community-build/community-projects/scalatest b/community-build/community-projects/scalatest
@@ -1 +1 @@
-Subproject commit 11be13672aa8ac4e634cd396524275f3634e544f
+Subproject commit ab588594ead517920309c909312b4ba0502a355c
diff --git a/community-build/community-projects/scodec-bits b/community-build/community-projects/scodec-bits
@@ -1 +1 @@
-Subproject commit df031e56bad0ea1d1a96dfe8405a16c0325265a0
+Subproject commit 95e79563af532f50e70eaed2d67f2a4d59a4890d
diff --git a/community-build/community-projects/utest b/community-build/community-projects/utest
@@ -1 +1 @@
-Subproject commit e1820e962ec5757323a6e12d5d723badad38cf70
+Subproject commit 5823688a9ae1d3b911e374d7d29c45e73c3be3c2
diff --git a/docs/docs/reference/metaprogramming/macros.md b/docs/docs/reference/metaprogramming/macros.md
@@ -237,7 +237,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.{given _, _}
+import scala.quoted._
 
 def compile(e: Exp, env: Map[String, Expr[Int]])(using QuoteContext): Expr[Int] = e match {
   case Num(n) =>
diff --git a/library/src/scala/quoted/matching/ConstSeq.scala b/library/src/scala/quoted/matching/ConstSeq.scala
diff --git a/library/src/scala/quoted/matching/ValueSeq.scala b/library/src/scala/quoted/matching/ValueSeq.scala
diff --git a/library/src/scala/quoted/matching/package.scala b/library/src/scala/quoted/matching/package.scala
diff --git a/library/src/scala/util/FromDigits.scala b/library/src/scala/util/FromDigits.scala
@@ -1,7 +1,6 @@
 package scala.util
 import scala.math.{BigInt}
 import quoted._
-import quoted.matching._
 import internal.Chars.digit2int
 import annotation.internal.sharable
 
diff --git a/tests/disabled/run/xml-interpolation-3/XmlQuote_1.scala b/tests/disabled/run/xml-interpolation-3/XmlQuote_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.tasty.Tasty
 import scala.quoted.autolift
 
 import scala.language.implicitConversions
diff --git a/tests/neg-macros/i6976.check b/tests/neg-macros/i6976.check
@@ -4,6 +4,6 @@
   |                                        ^^^^^^^^^
   |    Exception occurred while executing macro expansion.
   |    scala.MatchError: Inlined(EmptyTree,List(),Literal(Constant(2))) (of class dotty.tools.dotc.ast.Trees$Inlined)
-  |    	at playground.macros$.mcrImpl(Macro_1.scala:12)
+  |    	at playground.macros$.mcrImpl(Macro_1.scala:10)
   |
   | This location contains code that was inlined from Test_2.scala:5
diff --git a/tests/neg-macros/i6976/Macro_1.scala b/tests/neg-macros/i6976/Macro_1.scala
@@ -1,14 +1,12 @@
 package playground
 
-import scala.quoted._, scala.quoted.matching._
-import scala.quoted.{given _}
-import scala.tasty._
+import scala.quoted._
 
 object macros {
   inline def mcr(x: => Any) = ${mcrImpl('x)}
 
   def mcrImpl(body: Expr[Any])(using ctx: QuoteContext) : Expr[Any] = {
-    import ctx.tasty.{_, given _}
+    import ctx.tasty._
     body.unseal match { case Block(_, _) => '{2} }
   }
 }
diff --git a/tests/neg/i6762.scala b/tests/neg/i6762.scala
@@ -1,4 +1,4 @@
-import scala.quoted.{_, given _}
+import scala.quoted._
 
 type G[X]
 case class Foo[T](x: T)
diff --git a/tests/neg/i6997b.scala b/tests/neg/i6997b.scala
@@ -1,6 +1,6 @@
 package playground
 
-import scala.quoted.{_, given _}, scala.quoted.matching._
+import scala.quoted._
 
 inline def mcr(x: => Any): Any = ${mcrImpl('x)}
 
diff --git a/tests/neg/i7048e.scala b/tests/neg/i7048e.scala
@@ -1,4 +1,4 @@
-import scala.quoted.{given _, _}
+import scala.quoted._
 
 abstract class Test {
   type T
diff --git a/tests/neg/i7618.scala b/tests/neg/i7618.scala
@@ -1,6 +1,6 @@
 package macros
 
-import scala.quoted.{given _, _}
+import scala.quoted._
 
 enum Exp {
   case Num(n: Int)
diff --git a/tests/neg/i7618b.scala b/tests/neg/i7618b.scala
@@ -1,6 +1,6 @@
 package macros
 
-import scala.quoted.{given _, _}
+import scala.quoted._
 
 enum Exp {
   case Num(n: Int)
diff --git a/tests/neg/i7698.scala b/tests/neg/i7698.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.matching._
 
 trait Show[T] {
   def show(x: T): String
diff --git a/tests/neg/toexproftuple.scala b/tests/neg/toexproftuple.scala
@@ -1,5 +1,4 @@
 import scala.quoted._, scala.deriving._
-import scala.quoted.{given _}
 
 inline def mcr: Any = ${mcrImpl}
 def mcrImpl(using ctx: QuoteContext): Expr[Any] = {
diff --git a/tests/pos-macros/i7011/Macros_1.scala b/tests/pos-macros/i7011/Macros_1.scala
@@ -1,5 +1,4 @@
-import scala.quoted._, scala.quoted.matching._
-import scala.quoted.{given _}
+import scala.quoted._
 
 inline def mcr(body: => Any): Unit = ${mcrImpl('body)}
 
diff --git a/tests/pos-macros/treemap-unapply/Macro.scala b/tests/pos-macros/treemap-unapply/Macro.scala
@@ -1,4 +1,4 @@
-import scala.quoted.{ given _, _ }
+import scala.quoted._
 
 inline def mcr(x: => Unit): Unit = ${mcrImpl('x)}
 def mcrImpl(x: Expr[Unit])(using ctx: QuoteContext) : Expr[Unit] =
diff --git a/tests/pos/i6997c.scala b/tests/pos/i6997c.scala
@@ -1,6 +1,6 @@
 package playground
 
-import scala.quoted.{_, given _}, scala.quoted.matching._
+import scala.quoted._
 
 inline def mcr(x: => Any): Any = ${mcrImpl('x)}
 
diff --git a/tests/pos/i7048e.scala b/tests/pos/i7048e.scala
@@ -1,4 +1,4 @@
-import scala.quoted.{given _, _}
+import scala.quoted._
 
 abstract class Test {
   type T
diff --git a/tests/pos/i8651b.scala b/tests/pos/i8651b.scala
@@ -5,8 +5,6 @@ abstract class Coroutine[+T] {
 object Macros {
 
  import scala.quoted._
- import scala.quoted.matching._
-
 
  inline def coroutine[T](inline body: Any): Coroutine[T] = ${ coroutineImpl('{body}) }
 
diff --git a/tests/pos/quoted-pattern-type.scala b/tests/pos/quoted-pattern-type.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.tasty.Reflection
 
 object Lib {
 
diff --git a/tests/pos/scala2-macro-compat-1.scala b/tests/pos/scala2-macro-compat-1.scala
@@ -20,7 +20,7 @@ object LineNumberMacro2 {
 object LineNumberMacro3 {
   import scala.quoted._
   def thisLineNumberExpr(using qctx: QuoteContext): Expr[Int] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty._
     Expr(rootPosition.startLine + 1)
   }
 }
diff --git a/tests/pos/toexproftuple.scala b/tests/pos/toexproftuple.scala
@@ -1,5 +1,4 @@
 import scala.quoted._, scala.deriving._
-import scala.quoted.{given _}
 
 inline def mcr: Any = ${mcrImpl}
 def mcrImpl(using ctx: QuoteContext): Expr[Any] = {
diff --git a/tests/run-macros/i6765-b/Macro_1.scala b/tests/run-macros/i6765-b/Macro_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.{given _}
 
 inline def foo = ${fooImpl}
 
diff --git a/tests/run-macros/i6765-c/Macro_1.scala b/tests/run-macros/i6765-c/Macro_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.{given _}
 
 inline def foo(inline n: Int) = ${fooImpl('n)}
 
diff --git a/tests/run-macros/i6765/Macro_1.scala b/tests/run-macros/i6765/Macro_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.{given _}
 
 inline def foo = ${fooImpl}
 
diff --git a/tests/run-macros/i7008/macro_1.scala b/tests/run-macros/i7008/macro_1.scala
@@ -1,6 +1,4 @@
-import scala.quoted._, scala.quoted.matching._
-import scala.quoted.{given _}
-import scala.tasty._
+import scala.quoted._
 
 case class Box[T](v: T)
 
diff --git a/tests/run-macros/i7715/Macros_1.scala b/tests/run-macros/i7715/Macros_1.scala
@@ -1,4 +1,4 @@
-import scala.quoted.{ given _, _ }
+import scala.quoted._
 
 inline def mcr(e: => Any): Any = ${mcrImpl('e)}
 def mcrImpl(e: Expr[Any])(using ctx: QuoteContext): Expr[Any] =
diff --git a/tests/run-macros/quote-matching-optimize-2/Macro_1.scala b/tests/run-macros/quote-matching-optimize-2/Macro_1.scala
@@ -1,8 +1,6 @@
 import scala.quoted._
 import scala.quoted.autolift
 
-import scala.tasty.Reflection
-
 object Macro {
 
   inline def optimize[T](inline x: T): Any = ${ Macro.impl('x) }
diff --git a/tests/run-macros/quote-matching-optimize-3/Macro_1.scala b/tests/run-macros/quote-matching-optimize-3/Macro_1.scala
@@ -1,8 +1,6 @@
 import scala.quoted._
 import scala.quoted.autolift
 
-import scala.tasty.Reflection
-
 object Macro {
 
   inline def optimize[T](inline x: T): Any = ${ Macro.impl('x) }
diff --git a/tests/run-macros/quote-toExprOfSeq/Macro_1.scala b/tests/run-macros/quote-toExprOfSeq/Macro_1.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.{given _}
 
 inline def seq = ${fooImpl}
 
diff --git a/tests/run-macros/tasty-tree-map/quoted_1.scala b/tests/run-macros/tasty-tree-map/quoted_1.scala
@@ -5,7 +5,7 @@ object Macros {
   implicit inline def identityMaped[T](x: => T): T = ${ impl('x) }
 
   def impl[T: Type](x: Expr[T])(using qctx: QuoteContext) : Expr[T] = {
-    import qctx.tasty.{_, given _}
+    import qctx.tasty.{_, given _} // FIXME: #8919
     val identityMap = new TreeMap { }
     val transformed = identityMap.transformTerm(x.unseal).seal.cast[T]
     transformed
diff --git a/tests/run-staging/i6992/Macro_1.scala b/tests/run-staging/i6992/Macro_1.scala
@@ -1,7 +1,6 @@
 
-import scala.quoted._, scala.quoted.matching._
+import scala.quoted._
 import scala.quoted.staging._
-import scala.quoted.{given _}
 
 given Toolbox = Toolbox.make(getClass.getClassLoader)
 
diff --git a/tests/run-staging/quote-function-applied-to.scala b/tests/run-staging/quote-function-applied-to.scala
@@ -1,5 +1,4 @@
 import scala.quoted._
-import scala.quoted.{given _}
 import scala.quoted.staging._
 
 object Test {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import scala.quoted._`
`2`		`-import scala.tasty.Tasty`
`3`	`2`	`import scala.quoted.autolift`
`4`	`3`
`5`	`4`	`import scala.language.implicitConversions`