diff --git a/community-build/community-projects/xml-interpolator b/community-build/community-projects/xml-interpolator index b9a40faaf376..2667daea2b3a 160000 --- a/community-build/community-projects/xml-interpolator +++ b/community-build/community-projects/xml-interpolator @@ -1 +1 @@ -Subproject commit b9a40faaf3767cb0656cd9b2fb574a60929e15fc +Subproject commit 2667daea2b3a11546f76181501fd3cfc807b9201 diff --git a/docs/docs/reference/metaprogramming/macros.md b/docs/docs/reference/metaprogramming/macros.md index e2763ba104e4..8d93d24927ee 100644 --- a/docs/docs/reference/metaprogramming/macros.md +++ b/docs/docs/reference/metaprogramming/macros.md @@ -329,7 +329,7 @@ That is, the `showExpr` method converts its `Expr` argument to a string (`code`) the result back to an `Expr[String]` using `Expr.apply`. **Note**: Lifting `String` to `Expr[String]` using `Expr(code)` can be omitted by importing an implicit -conversion with `import scala.quoted.autolift.given`. The programmer is able to +conversion with `import scala.quoted.autolift`. The programmer is able to declutter slightly the code at the cost of readable _phase distinction_ between stages. diff --git a/library/src/scala/quoted/autolift.scala b/library/src/scala/quoted/autolift.scala index 986cbf13c7a3..5190618b1ac7 100644 --- a/library/src/scala/quoted/autolift.scala +++ b/library/src/scala/quoted/autolift.scala @@ -1,7 +1,4 @@ package scala.quoted -/** Enable implicit conversion from a term of type `T` to an expression of type `Expr[T]` */ -object autolift { - /** Implicit conversion from a term of type `T` to an expression of type `Expr[T]` */ - given autoToExpr[T](using Liftable[T], QuoteContext) as Conversion[T, Expr[T]] = Expr(_) -} +/** Implicit conversion from a term of type `T` to an expression of type `Expr[T]` */ +given autolift[T](using Liftable[T], QuoteContext) as Conversion[T, Expr[T]] = Expr(_) 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 index 867388d6ba13..cea591086a16 100644 --- 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,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros { diff --git a/tests/disabled/run/xml-interpolation-3/XmlQuote_1.scala b/tests/disabled/run/xml-interpolation-3/XmlQuote_1.scala index 88eebb720290..541f93ab2f5e 100644 --- a/tests/disabled/run/xml-interpolation-3/XmlQuote_1.scala +++ b/tests/disabled/run/xml-interpolation-3/XmlQuote_1.scala @@ -1,6 +1,6 @@ import scala.quoted._ import scala.tasty.Tasty -import scala.quoted.autolift.{given _} +import scala.quoted.autolift import scala.language.implicitConversions diff --git a/tests/neg-macros/i6432/Macro_1.scala b/tests/neg-macros/i6432/Macro_1.scala index 7c9b63deb114..b0bfa5d22c89 100644 --- a/tests/neg-macros/i6432/Macro_1.scala +++ b/tests/neg-macros/i6432/Macro_1.scala @@ -1,6 +1,6 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macro { diff --git a/tests/neg-macros/i6432b/Macro_1.scala b/tests/neg-macros/i6432b/Macro_1.scala index 7c9b63deb114..b0bfa5d22c89 100644 --- a/tests/neg-macros/i6432b/Macro_1.scala +++ b/tests/neg-macros/i6432b/Macro_1.scala @@ -1,6 +1,6 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macro { diff --git a/tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala b/tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala index 785b8562dc87..dd9681f00ea2 100644 --- a/tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala +++ b/tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala @@ -1,6 +1,6 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object E { diff --git a/tests/neg-macros/inline-tuples-1/Macro_1.scala b/tests/neg-macros/inline-tuples-1/Macro_1.scala index 737482583045..2d21e1ef267c 100644 --- a/tests/neg-macros/inline-tuples-1/Macro_1.scala +++ b/tests/neg-macros/inline-tuples-1/Macro_1.scala @@ -1,6 +1,6 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros { def tup1(tup: Expr[Tuple1[Int]]) (using QuoteContext): Expr[Int] = tup.unliftOrError.productIterator.map(_.asInstanceOf[Int]).sum diff --git a/tests/neg-macros/quote-interpolator-core-old.scala b/tests/neg-macros/quote-interpolator-core-old.scala index 40b8eed6a757..353344c7dc30 100644 --- a/tests/neg-macros/quote-interpolator-core-old.scala +++ b/tests/neg-macros/quote-interpolator-core-old.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift // This test checks the correct interpretation of the inlined value class diff --git a/tests/neg-macros/quote-macro-splice.scala b/tests/neg-macros/quote-macro-splice.scala index 35002b0e1d35..6be17d6be2cf 100644 --- a/tests/neg-macros/quote-macro-splice.scala +++ b/tests/neg-macros/quote-macro-splice.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Test { diff --git a/tests/neg-macros/splice-in-top-level-splice-1.scala b/tests/neg-macros/splice-in-top-level-splice-1.scala index 0e21dbbfd174..d158681f053f 100644 --- a/tests/neg-macros/splice-in-top-level-splice-1.scala +++ b/tests/neg-macros/splice-in-top-level-splice-1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Foo { inline def foo(): Int = ${bar(${x})} // error diff --git a/tests/neg-staging/quote-run-in-macro-1/quoted_1.scala b/tests/neg-staging/quote-run-in-macro-1/quoted_1.scala index 1913b4538e35..8302ed620772 100644 --- a/tests/neg-staging/quote-run-in-macro-1/quoted_1.scala +++ b/tests/neg-staging/quote-run-in-macro-1/quoted_1.scala @@ -1,6 +1,6 @@ import scala.quoted._ import scala.quoted.staging._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros { diff --git a/tests/pending/run/tasty-comments/quoted_1.scala b/tests/pending/run/tasty-comments/quoted_1.scala index aa1829c58ce7..407aac2c0e22 100644 --- a/tests/pending/run/tasty-comments/quoted_1.scala +++ b/tests/pending/run/tasty-comments/quoted_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros { diff --git a/tests/pos-macros/i6803b/Macro_1.scala b/tests/pos-macros/i6803b/Macro_1.scala index f4ffcc38c28f..80df9be51e49 100644 --- a/tests/pos-macros/i6803b/Macro_1.scala +++ b/tests/pos-macros/i6803b/Macro_1.scala @@ -2,7 +2,7 @@ package blah import scala.language.implicitConversions import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object AsObject { final class LineNo(val lineNo: Int) diff --git a/tests/pos-macros/quote-nested-object/Macro_1.scala b/tests/pos-macros/quote-nested-object/Macro_1.scala index e59154de5692..101c9e0dd5ce 100644 --- a/tests/pos-macros/quote-nested-object/Macro_1.scala +++ b/tests/pos-macros/quote-nested-object/Macro_1.scala @@ -1,6 +1,6 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macro { diff --git a/tests/pos-staging/quote-0.scala b/tests/pos-staging/quote-0.scala index b8d916b49fa5..73ed72685c4a 100644 --- a/tests/pos-staging/quote-0.scala +++ b/tests/pos-staging/quote-0.scala @@ -1,6 +1,6 @@ import scala.quoted._ import scala.quoted.staging._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros { diff --git a/tests/run-custom-args/Yretain-trees/tasty-definitions-2/Macro_1.scala b/tests/run-custom-args/Yretain-trees/tasty-definitions-2/Macro_1.scala index 87adb1155a04..9496fa9c66fa 100644 --- a/tests/run-custom-args/Yretain-trees/tasty-definitions-2/Macro_1.scala +++ b/tests/run-custom-args/Yretain-trees/tasty-definitions-2/Macro_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Foo { diff --git a/tests/run-custom-args/Yretain-trees/tasty-definitions-3/Macro_1.scala b/tests/run-custom-args/Yretain-trees/tasty-definitions-3/Macro_1.scala index 88e59f9b0b1c..8676765e824c 100644 --- a/tests/run-custom-args/Yretain-trees/tasty-definitions-3/Macro_1.scala +++ b/tests/run-custom-args/Yretain-trees/tasty-definitions-3/Macro_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Foo { diff --git a/tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_1.scala b/tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_1.scala index fb2d54292e08..db7bcc9b3446 100644 --- a/tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_1.scala +++ b/tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros { diff --git a/tests/run-macros/f-interpolation-1/FQuote_1.scala b/tests/run-macros/f-interpolation-1/FQuote_1.scala index 60962b00a915..381a7f0d2cec 100644 --- a/tests/run-macros/f-interpolation-1/FQuote_1.scala +++ b/tests/run-macros/f-interpolation-1/FQuote_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift import scala.language.implicitConversions diff --git a/tests/run-macros/f-interpolator-neg/Macros_1.scala b/tests/run-macros/f-interpolator-neg/Macros_1.scala index e0bea018ed54..2c76709d6704 100644 --- a/tests/run-macros/f-interpolator-neg/Macros_1.scala +++ b/tests/run-macros/f-interpolator-neg/Macros_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift import scala.language.implicitConversions diff --git a/tests/run-macros/i4734/Macro_1.scala b/tests/run-macros/i4734/Macro_1.scala index bb85c5236dfa..a3e0c48f3eb2 100644 --- a/tests/run-macros/i4734/Macro_1.scala +++ b/tests/run-macros/i4734/Macro_1.scala @@ -1,6 +1,6 @@ import scala.annotation.tailrec import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros { inline def unrolledForeach(seq: IndexedSeq[Int], f: => Int => Unit, inline unrollSize: Int): Unit = // or f: Int => Unit diff --git a/tests/run-macros/i4735/Macro_1.scala b/tests/run-macros/i4735/Macro_1.scala index 8716bd97dc65..9b67002655c5 100644 --- a/tests/run-macros/i4735/Macro_1.scala +++ b/tests/run-macros/i4735/Macro_1.scala @@ -1,5 +1,5 @@ import scala.annotation.tailrec -import scala.quoted.autolift.{given _} +import scala.quoted.autolift import scala.quoted._ diff --git a/tests/run-macros/i5119/Macro_1.scala b/tests/run-macros/i5119/Macro_1.scala index ac8aad2144d8..0dbd0f328553 100644 --- a/tests/run-macros/i5119/Macro_1.scala +++ b/tests/run-macros/i5119/Macro_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macro { class StringContextOps(sc: => StringContext) { diff --git a/tests/run-macros/i5119b/Macro_1.scala b/tests/run-macros/i5119b/Macro_1.scala index 92cd5f94db36..b838d9f0dfab 100644 --- a/tests/run-macros/i5119b/Macro_1.scala +++ b/tests/run-macros/i5119b/Macro_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macro { diff --git a/tests/run-macros/i5188a/Macro_1.scala b/tests/run-macros/i5188a/Macro_1.scala index 20f7ef4b6c5d..4bc9ba58015e 100644 --- a/tests/run-macros/i5188a/Macro_1.scala +++ b/tests/run-macros/i5188a/Macro_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Lib { inline def sum(inline args: Int*): Int = ${ impl('args) } diff --git a/tests/run-macros/i6518/Macro_1.scala b/tests/run-macros/i6518/Macro_1.scala index ba36b6b8f49a..887b2d61ec0f 100644 --- a/tests/run-macros/i6518/Macro_1.scala +++ b/tests/run-macros/i6518/Macro_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros { diff --git a/tests/run-macros/inferred-repeated-result/test_1.scala b/tests/run-macros/inferred-repeated-result/test_1.scala index 3f931524c7ae..6688c0da382a 100644 --- a/tests/run-macros/inferred-repeated-result/test_1.scala +++ b/tests/run-macros/inferred-repeated-result/test_1.scala @@ -1,6 +1,6 @@ object Macros { import scala.quoted._ - import scala.quoted.autolift.{given _} + import scala.quoted.autolift inline def go[T](inline t: T) = ${ impl('t) } def impl[T](expr: Expr[T])(using qctx: QuoteContext) : Expr[Unit] = { diff --git a/tests/run-macros/inline-option/Macro_1.scala b/tests/run-macros/inline-option/Macro_1.scala index 6a33738c54d8..c0838aadb6f6 100644 --- a/tests/run-macros/inline-option/Macro_1.scala +++ b/tests/run-macros/inline-option/Macro_1.scala @@ -1,6 +1,6 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros { diff --git a/tests/run-macros/inline-tuples-1/Macro_1.scala b/tests/run-macros/inline-tuples-1/Macro_1.scala index 737482583045..2d21e1ef267c 100644 --- a/tests/run-macros/inline-tuples-1/Macro_1.scala +++ b/tests/run-macros/inline-tuples-1/Macro_1.scala @@ -1,6 +1,6 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros { def tup1(tup: Expr[Tuple1[Int]]) (using QuoteContext): Expr[Int] = tup.unliftOrError.productIterator.map(_.asInstanceOf[Int]).sum diff --git a/tests/run-macros/inline-tuples-2/Macro_1.scala b/tests/run-macros/inline-tuples-2/Macro_1.scala index 6bd209ce634d..9d95da5bfc3e 100644 --- a/tests/run-macros/inline-tuples-2/Macro_1.scala +++ b/tests/run-macros/inline-tuples-2/Macro_1.scala @@ -1,6 +1,6 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros { diff --git a/tests/run-macros/inline-varargs-1/Macro_1.scala b/tests/run-macros/inline-varargs-1/Macro_1.scala index 6d4af70b7259..434d653af455 100644 --- a/tests/run-macros/inline-varargs-1/Macro_1.scala +++ b/tests/run-macros/inline-varargs-1/Macro_1.scala @@ -1,6 +1,6 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros { def sum(nums: Expr[Int]*) (using QuoteContext): Expr[Int] = nums.map(_.unliftOrError).sum diff --git a/tests/run-macros/quote-force/quoted_1.scala b/tests/run-macros/quote-force/quoted_1.scala index a0557b0b07c2..5e6284b80410 100644 --- a/tests/run-macros/quote-force/quoted_1.scala +++ b/tests/run-macros/quote-force/quoted_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift case class Location(owners: List[String]) diff --git a/tests/run-macros/quote-impure-by-name/quoted_1.scala b/tests/run-macros/quote-impure-by-name/quoted_1.scala index e324b5ae6f94..3fc2cb2af818 100644 --- a/tests/run-macros/quote-impure-by-name/quoted_1.scala +++ b/tests/run-macros/quote-impure-by-name/quoted_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift class Index[K, Keys](val index: String) extends AnyVal { diff --git a/tests/run-macros/quote-inline-function/quoted_1.scala b/tests/run-macros/quote-inline-function/quoted_1.scala index fae1f1e39e26..0cf18ee966ff 100644 --- a/tests/run-macros/quote-inline-function/quoted_1.scala +++ b/tests/run-macros/quote-inline-function/quoted_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros { diff --git a/tests/run-macros/quote-matching-optimize-1/Macro_1.scala b/tests/run-macros/quote-matching-optimize-1/Macro_1.scala index 0319a8614619..6475a88a8713 100644 --- a/tests/run-macros/quote-matching-optimize-1/Macro_1.scala +++ b/tests/run-macros/quote-matching-optimize-1/Macro_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macro { diff --git a/tests/run-macros/quote-matching-optimize-2/Macro_1.scala b/tests/run-macros/quote-matching-optimize-2/Macro_1.scala index fe5614606f60..6b08105a1bd9 100644 --- a/tests/run-macros/quote-matching-optimize-2/Macro_1.scala +++ b/tests/run-macros/quote-matching-optimize-2/Macro_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift import scala.tasty.Reflection diff --git a/tests/run-macros/quote-matching-optimize-3/Macro_1.scala b/tests/run-macros/quote-matching-optimize-3/Macro_1.scala index 9e11235232f2..a72924eb1dd4 100644 --- a/tests/run-macros/quote-matching-optimize-3/Macro_1.scala +++ b/tests/run-macros/quote-matching-optimize-3/Macro_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift import scala.tasty.Reflection diff --git a/tests/run-macros/quote-simple-macro/quoted_1.scala b/tests/run-macros/quote-simple-macro/quoted_1.scala index 7b5684d17e40..94caafdf135d 100644 --- a/tests/run-macros/quote-simple-macro/quoted_1.scala +++ b/tests/run-macros/quote-simple-macro/quoted_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros { inline def foo(inline i: Int, dummy: Int, j: Int): Int = ${ bar('i, 'j) } diff --git a/tests/run-macros/quote-unrolled-foreach/quoted_1.scala b/tests/run-macros/quote-unrolled-foreach/quoted_1.scala index af15816cf116..63443d79a8ca 100644 --- a/tests/run-macros/quote-unrolled-foreach/quoted_1.scala +++ b/tests/run-macros/quote-unrolled-foreach/quoted_1.scala @@ -1,6 +1,6 @@ import scala.annotation.tailrec import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macro { diff --git a/tests/run-macros/tasty-argument-tree-1/quoted_1.scala b/tests/run-macros/tasty-argument-tree-1/quoted_1.scala index 3b8a84c56ed4..52ee94fcc357 100644 --- a/tests/run-macros/tasty-argument-tree-1/quoted_1.scala +++ b/tests/run-macros/tasty-argument-tree-1/quoted_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros { diff --git a/tests/run-macros/tasty-custom-show/quoted_1.scala b/tests/run-macros/tasty-custom-show/quoted_1.scala index 9e3e0d25fca6..ecb5d5a5e0ae 100644 --- a/tests/run-macros/tasty-custom-show/quoted_1.scala +++ b/tests/run-macros/tasty-custom-show/quoted_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros { diff --git a/tests/run-macros/tasty-definitions-1/quoted_1.scala b/tests/run-macros/tasty-definitions-1/quoted_1.scala index 0994aca1578b..419e3958ae27 100644 --- a/tests/run-macros/tasty-definitions-1/quoted_1.scala +++ b/tests/run-macros/tasty-definitions-1/quoted_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros { diff --git a/tests/run-macros/tasty-eval/quoted_1.scala b/tests/run-macros/tasty-eval/quoted_1.scala index f40363f93547..d3a9f968d226 100644 --- a/tests/run-macros/tasty-eval/quoted_1.scala +++ b/tests/run-macros/tasty-eval/quoted_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros { diff --git a/tests/run-macros/tasty-extractors-1/quoted_1.scala b/tests/run-macros/tasty-extractors-1/quoted_1.scala index 4187cffeae85..1c53e7f22efe 100644 --- a/tests/run-macros/tasty-extractors-1/quoted_1.scala +++ b/tests/run-macros/tasty-extractors-1/quoted_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros { diff --git a/tests/run-macros/tasty-extractors-2/quoted_1.scala b/tests/run-macros/tasty-extractors-2/quoted_1.scala index f209f8aadcfc..92cfa16c9140 100644 --- a/tests/run-macros/tasty-extractors-2/quoted_1.scala +++ b/tests/run-macros/tasty-extractors-2/quoted_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros { diff --git a/tests/run-macros/tasty-extractors-3/quoted_1.scala b/tests/run-macros/tasty-extractors-3/quoted_1.scala index 133219604a6e..40a734be62ed 100644 --- a/tests/run-macros/tasty-extractors-3/quoted_1.scala +++ b/tests/run-macros/tasty-extractors-3/quoted_1.scala @@ -1,6 +1,6 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift 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 index f7ebec45890c..aef704c94069 100644 --- a/tests/run-macros/tasty-extractors-constants-1/quoted_1.scala +++ b/tests/run-macros/tasty-extractors-constants-1/quoted_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift diff --git a/tests/run-macros/tasty-extractors-types/quoted_1.scala b/tests/run-macros/tasty-extractors-types/quoted_1.scala index e0bae8aed646..98987bd989f2 100644 --- a/tests/run-macros/tasty-extractors-types/quoted_1.scala +++ b/tests/run-macros/tasty-extractors-types/quoted_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros { diff --git a/tests/run-macros/tasty-getfile-implicit-fun-context/Macro_1.scala b/tests/run-macros/tasty-getfile-implicit-fun-context/Macro_1.scala index 0fa79b566316..ae2b8ab0d0db 100644 --- a/tests/run-macros/tasty-getfile-implicit-fun-context/Macro_1.scala +++ b/tests/run-macros/tasty-getfile-implicit-fun-context/Macro_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object SourceFiles { diff --git a/tests/run-macros/tasty-getfile/Macro_1.scala b/tests/run-macros/tasty-getfile/Macro_1.scala index 2d517795989b..c72745d8692e 100644 --- a/tests/run-macros/tasty-getfile/Macro_1.scala +++ b/tests/run-macros/tasty-getfile/Macro_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object SourceFiles { diff --git a/tests/run-macros/tasty-indexed-map/quoted_1.scala b/tests/run-macros/tasty-indexed-map/quoted_1.scala index 957d2415d68f..f99cacbf051c 100644 --- a/tests/run-macros/tasty-indexed-map/quoted_1.scala +++ b/tests/run-macros/tasty-indexed-map/quoted_1.scala @@ -1,6 +1,6 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift class MyMap[Keys](private val underlying: Array[Int]) extends AnyVal { def get[K <: String](implicit i: Index[K, Keys]): Int = underlying(i.index) diff --git a/tests/run-macros/tasty-interpolation-1/Macro.scala b/tests/run-macros/tasty-interpolation-1/Macro.scala index 65c7afc3c0e5..091264a30e93 100644 --- a/tests/run-macros/tasty-interpolation-1/Macro.scala +++ b/tests/run-macros/tasty-interpolation-1/Macro.scala @@ -1,7 +1,7 @@ import scala.quoted._ import scala.language.implicitConversions -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macro { diff --git a/tests/run-macros/tasty-linenumber-2/quoted_1.scala b/tests/run-macros/tasty-linenumber-2/quoted_1.scala index 371d624c583f..d56f5982d298 100644 --- a/tests/run-macros/tasty-linenumber-2/quoted_1.scala +++ b/tests/run-macros/tasty-linenumber-2/quoted_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift class LineNumber(val value: Int) { override def toString: String = value.toString diff --git a/tests/run-macros/tasty-linenumber/quoted_1.scala b/tests/run-macros/tasty-linenumber/quoted_1.scala index abfee8bbb7b2..975ab4e3d8a4 100644 --- a/tests/run-macros/tasty-linenumber/quoted_1.scala +++ b/tests/run-macros/tasty-linenumber/quoted_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift class LineNumber(val value: Int) { override def toString: String = value.toString diff --git a/tests/run-macros/tasty-location/quoted_1.scala b/tests/run-macros/tasty-location/quoted_1.scala index a4b3b75ccb28..ebc1ebbcbe2c 100644 --- a/tests/run-macros/tasty-location/quoted_1.scala +++ b/tests/run-macros/tasty-location/quoted_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift case class Location(owners: List[String]) diff --git a/tests/run-macros/tasty-original-source/Macros_1.scala b/tests/run-macros/tasty-original-source/Macros_1.scala index 097782f1c1df..f26279d1c2d1 100644 --- a/tests/run-macros/tasty-original-source/Macros_1.scala +++ b/tests/run-macros/tasty-original-source/Macros_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros { diff --git a/tests/run-macros/tasty-positioned/quoted_1.scala b/tests/run-macros/tasty-positioned/quoted_1.scala index c5c07f9fb054..6c2e33c8b996 100644 --- a/tests/run-macros/tasty-positioned/quoted_1.scala +++ b/tests/run-macros/tasty-positioned/quoted_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift case class Position(path: String, start: Int, end: Int, startLine: Int, startColumn: Int, endLine: Int, endColumn: Int) 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 index b638bf23edaa..5416ba8e8518 100644 --- 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,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift import scala.language.implicitConversions diff --git a/tests/run-macros/tasty-subtyping/quoted_1.scala b/tests/run-macros/tasty-subtyping/quoted_1.scala index 06962012f4db..bf48dff6f869 100644 --- a/tests/run-macros/tasty-subtyping/quoted_1.scala +++ b/tests/run-macros/tasty-subtyping/quoted_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros { diff --git a/tests/run-macros/tasty-typeof/Macro_1.scala b/tests/run-macros/tasty-typeof/Macro_1.scala index fd8aef24e9ba..e84db284ee19 100644 --- a/tests/run-macros/tasty-typeof/Macro_1.scala +++ b/tests/run-macros/tasty-typeof/Macro_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros { diff --git a/tests/run-macros/xml-interpolation-1/XmlQuote_1.scala b/tests/run-macros/xml-interpolation-1/XmlQuote_1.scala index 619ce507637a..25339dd4678f 100644 --- a/tests/run-macros/xml-interpolation-1/XmlQuote_1.scala +++ b/tests/run-macros/xml-interpolation-1/XmlQuote_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift import scala.language.implicitConversions diff --git a/tests/run-macros/xml-interpolation-2/XmlQuote_1.scala b/tests/run-macros/xml-interpolation-2/XmlQuote_1.scala index 8fa57b3b4bb4..3437ee2f9c13 100644 --- a/tests/run-macros/xml-interpolation-2/XmlQuote_1.scala +++ b/tests/run-macros/xml-interpolation-2/XmlQuote_1.scala @@ -1,6 +1,6 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift import scala.language.implicitConversions diff --git a/tests/run-macros/xml-interpolation-3/XmlQuote_1.scala b/tests/run-macros/xml-interpolation-3/XmlQuote_1.scala index 8e27b051b957..6f6eb5b058d7 100644 --- a/tests/run-macros/xml-interpolation-3/XmlQuote_1.scala +++ b/tests/run-macros/xml-interpolation-3/XmlQuote_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift import scala.language.implicitConversions diff --git a/tests/run-macros/xml-interpolation-4/Macros_1.scala b/tests/run-macros/xml-interpolation-4/Macros_1.scala index 8c526b6ff19e..e5afa0c4c517 100644 --- a/tests/run-macros/xml-interpolation-4/Macros_1.scala +++ b/tests/run-macros/xml-interpolation-4/Macros_1.scala @@ -1,5 +1,5 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift import scala.language.implicitConversions diff --git a/tests/run-staging/quote-lib.scala b/tests/run-staging/quote-lib.scala index a70866824bd8..45389733b720 100644 --- a/tests/run-staging/quote-lib.scala +++ b/tests/run-staging/quote-lib.scala @@ -1,7 +1,7 @@ import scala.quoted._ import scala.quoted.staging._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift import liftable.Units._ import liftable.Lets._ diff --git a/tests/run-staging/quote-lift-Array.scala b/tests/run-staging/quote-lift-Array.scala index df6bac192dbe..8b7834fbf5aa 100644 --- a/tests/run-staging/quote-lift-Array.scala +++ b/tests/run-staging/quote-lift-Array.scala @@ -1,6 +1,6 @@ import scala.quoted._ import scala.quoted.staging._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Test { implicit val toolbox: scala.quoted.staging.Toolbox = scala.quoted.staging.Toolbox.make(getClass.getClassLoader) diff --git a/tests/run-staging/quote-lift-IArray.scala b/tests/run-staging/quote-lift-IArray.scala index 32e62a2ad94b..c37d981db8fe 100644 --- a/tests/run-staging/quote-lift-IArray.scala +++ b/tests/run-staging/quote-lift-IArray.scala @@ -1,6 +1,6 @@ import scala.quoted._ import scala.quoted.staging._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Test { implicit val toolbox: scala.quoted.staging.Toolbox = scala.quoted.staging.Toolbox.make(getClass.getClassLoader) diff --git a/tests/run-staging/quote-run-constants.scala b/tests/run-staging/quote-run-constants.scala index 49afdb8cd3a5..9396d69019e9 100644 --- a/tests/run-staging/quote-run-constants.scala +++ b/tests/run-staging/quote-run-constants.scala @@ -1,5 +1,5 @@ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift import scala.quoted._ import scala.quoted.staging._ diff --git a/tests/run-staging/quote-run-many.scala b/tests/run-staging/quote-run-many.scala index 8771e53a6a17..34ed0a1d121a 100644 --- a/tests/run-staging/quote-run-many.scala +++ b/tests/run-staging/quote-run-many.scala @@ -1,6 +1,6 @@ import scala.quoted._ import scala.quoted.staging._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Test { def main(args: Array[String]): Unit = { diff --git a/tests/run-staging/quote-run-staged-interpreter.scala b/tests/run-staging/quote-run-staged-interpreter.scala index d4c5c27ce7c2..27c56b1c158c 100644 --- a/tests/run-staging/quote-run-staged-interpreter.scala +++ b/tests/run-staging/quote-run-staged-interpreter.scala @@ -1,6 +1,6 @@ import scala.quoted._ import scala.quoted.staging._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift enum Exp { case Num(n: Int) diff --git a/tests/run-staging/quote-show-blocks.scala b/tests/run-staging/quote-show-blocks.scala index 79b00648f985..0067fe99ffff 100644 --- a/tests/run-staging/quote-show-blocks.scala +++ b/tests/run-staging/quote-show-blocks.scala @@ -1,6 +1,6 @@ import scala.quoted._ import scala.quoted.staging._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Test { given Toolbox = Toolbox.make(getClass.getClassLoader) diff --git a/tests/run-staging/quote-unrolled-foreach.scala b/tests/run-staging/quote-unrolled-foreach.scala index 8ac2a001c9a7..bab3a4e5a0e1 100644 --- a/tests/run-staging/quote-unrolled-foreach.scala +++ b/tests/run-staging/quote-unrolled-foreach.scala @@ -1,7 +1,7 @@ import scala.annotation.tailrec import scala.quoted._ import scala.quoted.staging._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Test { given Toolbox = Toolbox.make(getClass.getClassLoader) diff --git a/tests/run-staging/shonan-hmm-simple.scala b/tests/run-staging/shonan-hmm-simple.scala index c3a60fe0c313..b18d38930bb0 100644 --- a/tests/run-staging/shonan-hmm-simple.scala +++ b/tests/run-staging/shonan-hmm-simple.scala @@ -1,6 +1,6 @@ import scala.quoted._ import scala.quoted.staging._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift trait Ring[T]: val zero: T diff --git a/tests/run-staging/shonan-hmm/Lifters.scala b/tests/run-staging/shonan-hmm/Lifters.scala index d625b28f5d83..543f668f866f 100644 --- a/tests/run-staging/shonan-hmm/Lifters.scala +++ b/tests/run-staging/shonan-hmm/Lifters.scala @@ -3,7 +3,7 @@ import UnrolledExpr._ import scala.reflect.ClassTag import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Lifters { implicit def LiftedClassTag[T: Type: ClassTag] (using QuoteContext): Expr[ClassTag[T]] = { diff --git a/tests/run-staging/shonan-hmm/MVmult.scala b/tests/run-staging/shonan-hmm/MVmult.scala index 5cff7a5c6a28..f95327159b50 100644 --- a/tests/run-staging/shonan-hmm/MVmult.scala +++ b/tests/run-staging/shonan-hmm/MVmult.scala @@ -1,6 +1,6 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift class MVmult[Idx, T, Unt](tring: Ring[T], vec: VecROp[Idx, T, Unt]) { private[this] val blas2 = new Blas2(tring, vec) diff --git a/tests/run-staging/shonan-hmm/VecROp.scala b/tests/run-staging/shonan-hmm/VecROp.scala index c4d446926889..05dc6d8e0066 100644 --- a/tests/run-staging/shonan-hmm/VecROp.scala +++ b/tests/run-staging/shonan-hmm/VecROp.scala @@ -1,6 +1,6 @@ import scala.quoted._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift trait VecROp[Idx, T, Unt] extends VecOp[Idx, Unt] { def reduce: ((T, T) => T, T, Vec[Idx, T]) => T diff --git a/tests/run-staging/staged-streams_1.scala b/tests/run-staging/staged-streams_1.scala index 0e6481fd5414..c1f1863709df 100644 --- a/tests/run-staging/staged-streams_1.scala +++ b/tests/run-staging/staged-streams_1.scala @@ -1,7 +1,7 @@ import scala.quoted._ import scala.quoted.staging._ import scala.quoted.util._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift /** * Port of the strymonas library as described in O. Kiselyov et al., Stream fusion, to completeness (POPL 2017) diff --git a/tests/run-staging/tasty-extractors-constants-2/quoted_1.scala b/tests/run-staging/tasty-extractors-constants-2/quoted_1.scala index ae05f22f8c15..1054901c5d93 100644 --- a/tests/run-staging/tasty-extractors-constants-2/quoted_1.scala +++ b/tests/run-staging/tasty-extractors-constants-2/quoted_1.scala @@ -1,6 +1,6 @@ import scala.quoted._ import scala.quoted.staging._ -import scala.quoted.autolift.{given _} +import scala.quoted.autolift object Macros {