Move ExprMap to scala.quoted

library/src-bootstrapped/scala/quoted/util/ExprMap.scala → library/src-bootstrapped/scala/quoted/ExprMap.scala

@@ -1,8 +1,6 @@
-package scala.quoted.util
+package scala.quoted
 
-import scala.quoted._
-
-trait ExprMap {
+trait ExprMap:
 
   /** Map an expression `e` with a type `tpe` */
   def transform[T](e: Expr[T])(using qctx: QuoteContext, tpe: Type[T]): Expr[T]
@@ -149,4 +147,4 @@ trait ExprMap {
     new MapChildren().transformTermChildren(e.unseal, tpe.unseal.tpe).asExprOf[T]
   }
 
-}
+end ExprMap

tests/run-macros/expr-map-1/Macro_1.scala

@@ -6,7 +6,7 @@ inline def rewrite[T](inline x: Any): Any = ${ stringRewriter('x) }
 private def stringRewriter(e: Expr[Any])(using QuoteContext): Expr[Any] =
   StringRewriter.transform(e)
 
-private object StringRewriter extends util.ExprMap {
+private object StringRewriter extends ExprMap {
 
   def transform[T](e: Expr[T])(using QuoteContext, Type[T]): Expr[T] = e match
     case Const(s: String) =>

tests/run-macros/expr-map-2/Macro_1.scala

@@ -6,7 +6,7 @@ inline def rewrite[T](inline x: Any): Any = ${ stringRewriter('x) }
 private def stringRewriter(e: Expr[Any])(using QuoteContext): Expr[Any] =
   StringRewriter.transform(e)
 
-private object StringRewriter extends util.ExprMap {
+private object StringRewriter extends ExprMap {
 
   def transform[T](e: Expr[T])(using QuoteContext, Type[T]): Expr[T] = e match
     case '{ ($x: Foo).x } =>

tests/run-macros/flops-rewrite-2/Macro_1.scala

@@ -63,7 +63,7 @@ private object Rewriter {
     new Rewriter(preTransform, postTransform, fixPoint)
 }
 
-private class Rewriter(preTransform: List[Transformation[_]] = Nil, postTransform: List[Transformation[_]] = Nil, fixPoint: Boolean) extends util.ExprMap {
+private class Rewriter(preTransform: List[Transformation[_]] = Nil, postTransform: List[Transformation[_]] = Nil, fixPoint: Boolean) extends ExprMap {
   def transform[T](e: Expr[T])(using QuoteContext, Type[T]): Expr[T] = {
     val e2 = preTransform.foldLeft(e)((ei, transform) => transform(ei))
     val e3 = transformChildren(e2)

tests/run-macros/flops-rewrite-3/Macro_1.scala

@@ -92,7 +92,7 @@ private object Rewriter {
   def apply(): Rewriter = new Rewriter(Nil, Nil, false)
 }
 
-private class Rewriter private (preTransform: List[Transformation] = Nil, postTransform: List[Transformation] = Nil, fixPoint: Boolean) extends util.ExprMap {
+private class Rewriter private (preTransform: List[Transformation] = Nil, postTransform: List[Transformation] = Nil, fixPoint: Boolean) extends ExprMap {
 
   def withFixPoint: Rewriter =
     new Rewriter(preTransform, postTransform, fixPoint = true)

tests/run-macros/flops-rewrite/Macro_1.scala

@@ -28,7 +28,7 @@ private object Rewriter {
     new Rewriter(preTransform, postTransform, fixPoint)
 }
 
-private class Rewriter(preTransform: Expr[Any] => Expr[Any], postTransform: Expr[Any] => Expr[Any], fixPoint: Boolean) extends util.ExprMap {
+private class Rewriter(preTransform: Expr[Any] => Expr[Any], postTransform: Expr[Any] => Expr[Any], fixPoint: Boolean) extends ExprMap {
   def transform[T](e: Expr[T])(using QuoteContext, Type[T]): Expr[T] = {
     val e2 = checkedTransform(e, preTransform)
     val e3 = transformChildren(e2)