Change more tests to new given syntax

Author: odersky

tests/disabled/neg-with-compiler/quote-run-in-macro-2/quoted_1.scala

@@ -1,5 +1,5 @@
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 object Macros {
 

tests/disabled/run/xml-interpolation-3/XmlQuote_1.scala

@@ -1,6 +1,6 @@
 import scala.quoted._
 import scala.tasty.Tasty
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 import scala.language.implicitConversions
 

tests/neg-custom-args/implicit-conversions.scala

@@ -21,7 +21,7 @@ object D {
 }
 
 object Test {
-  import given D._
+  import D.given
 
   val x1: A = new B
   val x2: B = new A  // error under -Xfatal-warnings -feature

tests/neg-macros/i6432/Macro_1.scala

@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 import scala.quoted.matching._
 
 object Macro {

tests/neg-macros/i6432b/Macro_1.scala

@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 import scala.quoted.matching._
 
 object Macro {

tests/neg-macros/inline-macro-staged-interpreter/Macro_1.scala

@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 object E {
 

tests/neg-macros/inline-tuples-1/Macro_1.scala

@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 object Macros {
   def tup1(tup: Tuple1[Int])(given QuoteContext): Expr[Int] = tup.productIterator.map(_.asInstanceOf[Int]).sum

tests/neg-macros/quote-interpolator-core-old.scala

@@ -1,5 +1,5 @@
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 // This test checks the correct interpretation of the inlined value class
 

tests/neg-macros/quote-macro-splice.scala

@@ -1,5 +1,5 @@
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 object Test {
 

tests/neg-macros/splice-in-top-level-splice-1.scala

@@ -1,5 +1,5 @@
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 object Foo {
   inline def foo(): Int = ${bar(${x})} // error

tests/neg-staging/quote-run-in-macro-1/quoted_1.scala

@@ -1,6 +1,6 @@
 import scala.quoted._
 import scala.quoted.staging._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 object Macros {
 

tests/neg/exports.check

@@ -30,13 +30,13 @@
    |                    final def status: => List[String] in class Copier at line 23 and
    |                    final def status: => List[String] in class Copier at line 24
    |                    have the same type after erasure.
--- [E120] Duplicate Symbol Error: tests/neg/exports.scala:26:27 --------------------------------------------------------
-26 |    export given printUnit.status   // error: no eligible member
-   |                           ^
-   |                           Double definition:
-   |                           final def status: => List[String] in class Copier at line 24 and
-   |                           final def status: => List[String] in class Copier at line 26
-   |                           have the same type after erasure.
+-- [E120] Duplicate Symbol Error: tests/neg/exports.scala:26:21 --------------------------------------------------------
+26 |    export printUnit.status         // error: double definition
+   |                     ^
+   |                     Double definition:
+   |                     final def status: => List[String] in class Copier at line 24 and
+   |                     final def status: => List[String] in class Copier at line 26
+   |                     have the same type after erasure.
 -- Error: tests/neg/exports.scala:35:24 --------------------------------------------------------------------------------
 35 |    export this.{concat => ++}   // error: no eligible member
    |                 ^^^^^^^^^^^^

tests/neg/exports.scala

@@ -23,7 +23,7 @@
     export printUnit.{stat => _, _} // error: double definition // error: double definition
     export scanUnit._               // error: double definition
     export printUnit.bitmap         // error: no eligible member
-    export given printUnit.status   // error: no eligible member
+    export printUnit.status         // error: double definition
 
     def status: List[String] = printUnit.status ++ scanUnit.status
   }

tests/neg/import-implied.scala

@@ -5,25 +5,23 @@ object A {
 }
 object B {
   import A._
-  foo            // error: no implicit argument was found
+  foo             // error: no implicit argument was found
   foo(given tc)   // error: not found: tc
   foo(given A.tc) // ok
 }
 object C {
   import A._
-  import given A.tc
+  import A.tc
   foo            // ok
   foo(given tc)  // ok
 }
 object D {
-  import A.foo
-  import given A._
+  import A.{foo, given}
   foo            // ok
   foo(given tc)  // ok
 }
 object E {
-  import A._
-  import given A._
+  import A.{_, given}
   foo            // ok
   foo(given tc)  // ok
 }

tests/neg/toexproftuple.scala

@@ -1,5 +1,5 @@
 import scala.quoted._, scala.deriving._
-import given scala.quoted._
+import scala.quoted.given
 
 inline def mcr: Any = ${mcrImpl}
 def mcrImpl(given ctx: QuoteContext): Expr[Any] = {

tests/pending/run/tasty-comments/quoted_1.scala

@@ -1,5 +1,5 @@
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 
 object Macros {

tests/pos-macros/i6803b/Macro_1.scala

@@ -2,7 +2,7 @@ package blah
 
 import scala.language.implicitConversions
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 object AsObject {
   final class LineNo(val lineNo: Int)

tests/pos-macros/i6803b/Test_2.scala

@@ -5,7 +5,7 @@ object Test {
 
     def testO(): Unit = {
       import AsObject.LineNo
-      summon[LineNo] given LineNo.x
+      summon[LineNo](given LineNo.x)
     }
   }
 }

tests/pos-macros/quote-nested-object/Macro_1.scala

@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 object Macro {
 

tests/pos-staging/quote-0.scala

@@ -1,22 +1,22 @@
 import scala.quoted._
 import scala.quoted.staging._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 object Macros {
 
 
   inline def assert(expr: => Boolean): Unit =
     ${ assertImpl('expr) }
 
-  def assertImpl(expr: Expr[Boolean])(given QuoteContext) =
+  def assertImpl(expr: Expr[Boolean])(given QuoateContext) =
     '{ if !($expr) then throw new AssertionError(s"failed assertion: ${${showExpr(expr)}}") }
 
 
-  def showExpr[T](expr: Expr[T])(given QuoteContext): Expr[String] = expr.toString
+  def showExpr[T](expr: Expr[T])(given QuoateContext): Expr[String] = expr.toString
 
   inline def power(inline n: Int, x: Double) = ${ powerCode(n, 'x) }
 
-  def powerCode(n: Int, x: Expr[Double])(given QuoteContext): Expr[Double] =
+  def powerCode(n: Int, x: Expr[Double])(given QuoateContext): Expr[Double] =
     if (n == 0) '{1.0}
     else if (n == 1) x
     else if (n % 2 == 0) '{ { val y = $x * $x; ${ powerCode(n / 2, 'y) } } }
@@ -25,7 +25,7 @@ object Macros {
 
 class Test {
 
-  given Toolbox = Toolbox.make(getClass.getClassLoader)
+  given as Toolbox = Toolbox.make(getClass.getClassLoader)
 
   run {
     val program = '{

tests/pos/given-constrapps.scala

@@ -13,7 +13,7 @@ class C2(n: Int)(given x: TC)(given List[TC]) {
 class D extends C(given tc)
 class D2 extends C2(1)(given tc)(given Nil)
 
-class Foo given TC {
+class Foo(given TC) {
   assert(summon[TC] != null)
 }
 

tests/pos/i2723.scala

@@ -1,3 +1,3 @@
 trait App(init: (given Array[String]) => Unit) {
-  inline def main(args: Array[String]): Unit = init given args
+  inline def main(args: Array[String]): Unit = init(given args)
 }

tests/pos/reference/delegates.scala

@@ -249,7 +249,7 @@ object Implicits extends Common {
 object Test extends App {
   Instances.test()
   import PostConditions.result
-  import given PostConditions._
+  import PostConditions.given
   val s = List(1, 2, 3).sum
   s.ensuring(result == 6)
 }

tests/pos/toexproftuple.scala

@@ -1,5 +1,5 @@
 import scala.quoted._, scala.deriving._
-import given scala.quoted._
+import scala.quoted.given
 
 inline def mcr: Any = ${mcrImpl}
 def mcrImpl(given ctx: QuoteContext): Expr[Any] = {

tests/run-custom-args/Yretain-trees/tasty-definitions-2/Macro_1.scala

@@ -1,5 +1,5 @@
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 object Foo {
 

tests/run-custom-args/Yretain-trees/tasty-definitions-3/Macro_1.scala

@@ -1,5 +1,5 @@
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 object Foo {
 

tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_1.scala

@@ -1,5 +1,5 @@
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 object Macros {
 

tests/run-macros/f-interpolation-1/FQuote_1.scala

@@ -1,5 +1,5 @@
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 import scala.language.implicitConversions
 

tests/run-macros/f-interpolator-neg/Macros_1.scala

@@ -1,5 +1,5 @@
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 import scala.quoted.matching._
 
 import scala.language.implicitConversions

tests/run-macros/i4734/Macro_1.scala

@@ -1,6 +1,6 @@
 import scala.annotation.tailrec
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 object Macros {
   inline def unrolledForeach(seq: IndexedSeq[Int], f: => Int => Unit, inline unrollSize: Int): Unit = // or f: Int => Unit

tests/run-macros/i4735/Macro_1.scala

@@ -1,5 +1,5 @@
 import scala.annotation.tailrec
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 import scala.quoted._
 

tests/run-macros/i5119/Macro_1.scala

@@ -1,5 +1,5 @@
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 object Macro {
   class StringContextOps(sc: => StringContext) {

tests/run-macros/i5119b/Macro_1.scala

@@ -1,5 +1,5 @@
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 
 object Macro {

tests/run-macros/i5188a/Macro_1.scala

@@ -1,5 +1,5 @@
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 object Lib {
   inline def sum(inline args: Int*): Int = ${ impl(args: _*) }

tests/run-macros/i6518/Macro_1.scala

@@ -1,5 +1,5 @@
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 object Macros {
 

tests/run-macros/i6765-b/Macro_1.scala

@@ -1,5 +1,5 @@
 import scala.quoted._
-import given scala.quoted._
+import scala.quoted.given
 
 inline def foo = ${fooImpl}
 

tests/run-macros/i6765/Macro_1.scala

@@ -1,5 +1,5 @@
 import scala.quoted._
-import given scala.quoted._
+import scala.quoted.given
 
 inline def foo = ${fooImpl}
 

tests/run-macros/inferred-repeated-result/test_1.scala

@@ -1,6 +1,6 @@
 object Macros {
   import scala.quoted._
-  import given scala.quoted.autolift._
+  import scala.quoted.autolift.given
 
   inline def go[T](t: => T) = ${ impl('t) }
   def impl[T](expr: Expr[T])(given qctx: QuoteContext): Expr[Unit] = {

tests/run-macros/inline-option/Macro_1.scala

@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 object Macros {
 

tests/run-macros/inline-tuples-1/Macro_1.scala

@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 object Macros {
   def tup1(tup: Tuple1[Int])(given QuoteContext): Expr[Int] = tup.productIterator.map(_.asInstanceOf[Int]).sum

tests/run-macros/inline-tuples-2/Macro_1.scala

@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 object Macros {
 

tests/run-macros/inline-varargs-1/Macro_1.scala

@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 object Macros {
   def sum(nums: Int*)(given QuoteContext): Expr[Int] = nums.sum

tests/run-macros/quote-force/quoted_1.scala

@@ -1,5 +1,5 @@
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 case class Location(owners: List[String])
 

tests/run-macros/quote-impure-by-name/quoted_1.scala

@@ -1,5 +1,5 @@
 import scala.quoted._
-import given scala.quoted.autolift._
+import scala.quoted.autolift.given
 
 
 class Index[K, Keys](val index: String) extends AnyVal {