diff --git a/tests/neg-macros/macros-in-same-project-6/Foo.scala b/tests/neg-macros/macros-in-same-project-6/Foo.scala index 08097785f6a1..89c70b755215 100644 --- a/tests/neg-macros/macros-in-same-project-6/Foo.scala +++ b/tests/neg-macros/macros-in-same-project-6/Foo.scala @@ -5,7 +5,7 @@ object Foo { inline def myMacro(): Unit = ${ aMacroImplementation } def aMacroImplementation(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.tasty.{given _, _} + import qctx.tasty._ error("some error", rootPosition) throw new NoClassDefFoundError("Bar$") } diff --git a/tests/pos-macros/i8325/Macro_1.scala b/tests/pos-macros/i8325/Macro_1.scala index 61a939fce11a..5e03cbce2a32 100644 --- a/tests/pos-macros/i8325/Macro_1.scala +++ b/tests/pos-macros/i8325/Macro_1.scala @@ -12,7 +12,7 @@ object A: def pure[A](a:A):A = ??? def transformImplExpr[A:Type](using qctx: QuoteContext)(expr: Expr[A]): Expr[A] = { - import qctx.tasty.{given _, _} + import qctx.tasty._ expr.unseal match { case Inlined(x,y,z) => transformImplExpr(z.seal.asInstanceOf[Expr[A]]) case Apply(fun,args) => '{ A.pure(${Apply(fun,args).seal.asInstanceOf[Expr[A]]}) } diff --git a/tests/pos-macros/i8325b/Macro_1.scala b/tests/pos-macros/i8325b/Macro_1.scala index d66329c531f1..050d0b7ccb4c 100644 --- a/tests/pos-macros/i8325b/Macro_1.scala +++ b/tests/pos-macros/i8325b/Macro_1.scala @@ -12,7 +12,7 @@ object A: def pure[A](a:A):A = ??? def transformImplExpr[A:Type](using qctx: QuoteContext)(expr: Expr[A]): Expr[A] = { - import qctx.tasty.{given _, _} + import qctx.tasty._ expr.unseal match { case Inlined(x,y,z) => transformImplExpr(z.seal.asInstanceOf[Expr[A]]) case r@Apply(fun,args) => '{ diff --git a/tests/pos/i7887.scala b/tests/pos/i7887.scala index 587c0f4df6c7..773da5c713c3 100644 --- a/tests/pos/i7887.scala +++ b/tests/pos/i7887.scala @@ -1,5 +1,5 @@ def typed[A](using t: quoted.Type[A], qctx: quoted.QuoteContext): Unit = { - import qctx.tasty.{given _, _} + import qctx.tasty._ '{ type T = $t ${'{???}.cast[T]} diff --git a/tests/run-macros/i6803/Macro_1.scala b/tests/run-macros/i6803/Macro_1.scala index 288904bba029..ed02708eb912 100644 --- a/tests/run-macros/i6803/Macro_1.scala +++ b/tests/run-macros/i6803/Macro_1.scala @@ -9,7 +9,7 @@ object AsObject { def unsafe(i: Int): LineNo = new LineNo(i) inline given LineNo = ${impl} private def impl(using qctx: QuoteContext): Expr[LineNo] = { - import qctx.tasty.{given _, _} + import qctx.tasty._ '{unsafe(${Expr(rootPosition.startLine)})} } } @@ -21,7 +21,7 @@ package AsPackage { def unsafe(i: Int): LineNo = new LineNo(i) inline given LineNo = ${impl} private def impl(using qctx: QuoteContext): Expr[LineNo] = { - import qctx.tasty.{given _, _} + import qctx.tasty._ '{unsafe(${Expr(rootPosition.startLine)})} } } diff --git a/tests/run-macros/i7025/Macros_1.scala b/tests/run-macros/i7025/Macros_1.scala index 21ff73b7781f..7b6c16474c94 100644 --- a/tests/run-macros/i7025/Macros_1.scala +++ b/tests/run-macros/i7025/Macros_1.scala @@ -4,7 +4,7 @@ object Macros { inline def debug: Unit = ${Macros.debugImpl} def debugImpl(using qctx: QuoteContext): Expr[Unit] = { - import qctx.tasty.{given _, _} + import qctx.tasty._ def nearestEnclosingDef(owner: Symbol): Symbol = if owner.isClassDef then owner diff --git a/tests/run-macros/quote-matcher-runtime/quoted_1.scala b/tests/run-macros/quote-matcher-runtime/quoted_1.scala index 314b12a97b6b..543b002ce429 100644 --- a/tests/run-macros/quote-matcher-runtime/quoted_1.scala +++ b/tests/run-macros/quote-matcher-runtime/quoted_1.scala @@ -5,7 +5,7 @@ object Macros { inline def matches[A, B](inline a: A, inline b: B): Unit = ${impl('a, 'b)} private def impl[A, B](a: Expr[A], b: Expr[B])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.tasty.{Bind => _, given _, _} + import qctx.tasty._ val res = scala.internal.quoted.Expr.unapply[Tuple, Tuple](a)(using b, true, qctx).map { tup => tup.toArray.toList.map { diff --git a/tests/run-macros/quote-type-matcher/quoted_1.scala b/tests/run-macros/quote-type-matcher/quoted_1.scala index baa9749e14eb..3867d331e7db 100644 --- a/tests/run-macros/quote-type-matcher/quoted_1.scala +++ b/tests/run-macros/quote-type-matcher/quoted_1.scala @@ -5,7 +5,7 @@ object Macros { inline def matches[A, B]: Unit = ${ matchesExpr('[A], '[B]) } private def matchesExpr[A, B](a: Type[A], b: Type[B])(using qctx: QuoteContext) : Expr[Unit] = { - import qctx.tasty.{Bind => _, given _, _} + import qctx.tasty._ val res = scala.internal.quoted.Type.unapply[Tuple, Tuple](a)(using b, true, qctx).map { tup => tup.toArray.toList.map { diff --git a/tests/run-macros/quoted-matching-docs/Macro_1.scala b/tests/run-macros/quoted-matching-docs/Macro_1.scala index 6aaade5c99bc..2376d3b0fc01 100644 --- a/tests/run-macros/quoted-matching-docs/Macro_1.scala +++ b/tests/run-macros/quoted-matching-docs/Macro_1.scala @@ -10,7 +10,7 @@ private def sumExprShow(argsExpr: Expr[Seq[Int]]) (using QuoteContext): Expr[Str Expr(sumExpr(argsExpr).show) private def sumExpr(argsExpr: Expr[Seq[Int]])(using qctx: QuoteContext) : Expr[Int] = { - import qctx.tasty.{given _, _} + import qctx.tasty._ UnsafeExpr.underlyingArgument(argsExpr) match { case Varargs(Consts(args)) => // args is of type Seq[Int] Expr(args.sum) // precompute result of sum diff --git a/tests/run-macros/refined-selectable-macro/Macro_1.scala b/tests/run-macros/refined-selectable-macro/Macro_1.scala index 42454e9968b3..1b9c750885de 100644 --- a/tests/run-macros/refined-selectable-macro/Macro_1.scala +++ b/tests/run-macros/refined-selectable-macro/Macro_1.scala @@ -12,7 +12,7 @@ object Macro { } private def toTupleImpl(s: Expr[Selectable])(using qctx:QuoteContext) : Expr[Tuple] = { - import qctx.tasty.{given _, _} + import qctx.tasty._ val repr = s.unseal.tpe.widenTermRefExpr.dealias @@ -46,7 +46,7 @@ object Macro { } private def fromTupleImpl[T: Type](s: Expr[Tuple], newRecord: Expr[Array[(String, Any)] => T])(using qctx:QuoteContext) : Expr[Any] = { - import qctx.tasty.{given _, _} + import qctx.tasty._ val repr = s.unseal.tpe.widenTermRefExpr.dealias diff --git a/tests/run-macros/requiredSymbols/Macro_1.scala b/tests/run-macros/requiredSymbols/Macro_1.scala index c047e65f9376..f0f2efef8f79 100644 --- a/tests/run-macros/requiredSymbols/Macro_1.scala +++ b/tests/run-macros/requiredSymbols/Macro_1.scala @@ -3,7 +3,7 @@ import scala.quoted._ object Macro { inline def foo: String = ${ fooImpl } def fooImpl(using qctx: QuoteContext) : Expr[String] = { - import qctx.tasty.{given _, _} + import qctx.tasty._ val list = List( rootContext.requiredPackage("java"), rootContext.requiredPackage("java.lang"), diff --git a/tests/run-macros/tasty-construct-types/Macro_1.scala b/tests/run-macros/tasty-construct-types/Macro_1.scala index bf091a7ac620..9367922e1728 100644 --- a/tests/run-macros/tasty-construct-types/Macro_1.scala +++ b/tests/run-macros/tasty-construct-types/Macro_1.scala @@ -12,7 +12,7 @@ object Macros { class TestAnnotation extends scala.annotation.Annotation def theTestBlockImpl(using qctx : QuoteContext) : Expr[Unit] = { - import qctx.tasty.{_,given _} + import qctx.tasty._ val x1T = ConstantType(Constant(1)) val x2T = OrType(ConstantType(Constant(1)), ConstantType(Constant(2))) diff --git a/tests/run-macros/tasty-positioned/quoted_1.scala b/tests/run-macros/tasty-positioned/quoted_1.scala index c5c07f9fb054..ebbc06b54388 100644 --- a/tests/run-macros/tasty-positioned/quoted_1.scala +++ b/tests/run-macros/tasty-positioned/quoted_1.scala @@ -11,7 +11,7 @@ object Positioned { implicit inline def apply[T](x: => T): Positioned[T] = ${impl('x)} def impl[T](x: Expr[T])(implicit ev: Type[T], qctx: QuoteContext): Expr[Positioned[T]] = { - import qctx.tasty.{Position => _, _, given _} + import qctx.tasty.{Position => _, _} val pos = rootPosition val path = pos.sourceFile.jpath.toString