Fix tests

Author: odersky

library/src-bootstrapped/scala/internal/quoted/Expr.scala

@@ -58,13 +58,13 @@ object Expr {
   }
 
   /** Returns a null expresssion equivalent to `'{null}` */
-  def `null`: QuoteContext ?=> quoted.Expr[Null] = qctx ?=> {
+  def `null`: QuoteContext ?=> quoted.Expr[Null] = (using qctx) => {
     import qctx.reflect._
     Literal(Constant.Null()).seal.asInstanceOf[quoted.Expr[Null]]
   }
 
   /** Returns a unit expresssion equivalent to `'{}` or `'{()}` */
-  def Unit: QuoteContext ?=> quoted.Expr[Unit] = qctx ?=> {
+  def Unit: QuoteContext ?=> quoted.Expr[Unit] = (using qctx) => {
     import qctx.reflect._
     Literal(Constant.Unit()).seal.asInstanceOf[quoted.Expr[Unit]]
   }

tests/neg/i2006.scala

@@ -4,7 +4,7 @@ object Test {
   inline def bar(f: Int ?=> Int) = f // error
 
   def main(args: Array[String]) = {
-    foo(thisTransaction ?=> 43)
-    bar(thisTransaction ?=> 44)
+    foo((using thisTransaction) => 43)
+    bar((using thisTransaction) => 44)
   }
 }

tests/neg/i2146.scala

@@ -1,5 +1,5 @@
 class Test {
-  def foo[A, B]: A ?=> B ?=> Int = { (b: B) ?=>  // error: found Int, required: A ?=> B ?=> Int
+  def foo[A, B]: A ?=> B ?=> Int = { (using b: B) =>  // error: found Int, required: A ?=> B ?=> Int
     42
   }
 }

tests/neg/i4668.scala

@@ -8,4 +8,4 @@ trait Functor[F[_]] { def map[A,B](x: F[A])(f: A => B): F[B] }
 object Functor { implicit object listFun extends Functor[List] { def map[A,B](ls: List[A])(f: A => B) = ls.map(f) } }
 
 val map: (A:Type,B:Type,F:Type1) ?=>  (Functor[F.T]) ?=> (F.T[A.T]) => (A.T => B.T) => F.T[B.T] =
-  fun ?=> x => f => fun.map(x)(f) // error
+  (using fun) => (using x) => f => fun.map(x)(f) // error

tests/neg/scoped-quoted-expr-proto.scala

@@ -69,7 +69,7 @@ package b {
       }
     }
 
-    r { qctx ?=>
+    r { (using qctx) =>
       var escaped: qctx.Expr[Double] = ???
       q{ (x: Double) =>
         s{
@@ -127,7 +127,7 @@ package c {
       }
     }
 
-    r { qctx ?=>
+    r { (using qctx) =>
       var escaped: qctx.Expr[Double] = ???
       q{ (x: Double) =>
         s{

tests/pos/case-getters.scala

@@ -1,6 +1,6 @@
 case class Foo(x: 1, y: Int ?=> Int)
 object Test {
-  val f = Foo(1, (i: Int) ?=> i)
+  val f = Foo(1, (using i: Int) => i)
   val fx1: 1 = f.x
   val fx2: 1 = f._1
   val fy1: Int = f.y(using 1)

tests/pos/i5966.scala

@@ -1,5 +1,5 @@
 object Test {
-  def foo = (v: Int) ?=> (x: Int) => v + x
+  def foo = (using v: Int) => (x: Int) => v + x
   given myInt as Int = 4
 
   foo.apply(1)

tests/pos/i6863/lib_1.scala

@@ -1,2 +1,2 @@
 trait Ctx
-inline def foo(): Unit = (x: Ctx) ?=> ()
+inline def foo(): Unit = (using x: Ctx) => ()

tests/pos/ift-assign.scala

@@ -1,7 +1,7 @@
 class Context
 
 object Test {
-  var f: Context ?=> String = (_ ?=> "")
+  var f: Context ?=> String = ((using _) => "")
 
   f = f
 

tests/pos/inline-apply.scala

@@ -5,7 +5,7 @@ object Test {
   def transform()(implicit ctx: Context) = {
     inline def withLocalOwner[T](op: Context ?=> T) = op(using ctx)
 
-    withLocalOwner { ctx ?=> }
+    withLocalOwner { (using ctx) => }
 
   }
 }

tests/pos/reference/delegates.scala

@@ -78,12 +78,12 @@ object Instances extends Common:
     println(minimum(xs))
 
   case class Context(value: String)
-  val c0: Context ?=> String = ctx ?=> ctx.value
-  val c1: Context ?=> String = (ctx: Context) ?=> ctx.value
+  val c0: Context ?=> String = (using ctx) => ctx.value
+  val c1: Context ?=> String = (using ctx: Context) => ctx.value
 
   class A
   class B
-  val ab: (x: A, y: B) ?=> Int = (a: A, b: B) ?=> 22
+  val ab: (x: A, y: B) ?=> Int = (using a: A, b: B) => 22
 
   trait TastyAPI:
     type Symbol

tests/pos/tasty-tags-obscure.scala

@@ -1,7 +1,7 @@
 object ObscureTasty:
 
   def foo(f: [t] => List[t] ?=> Unit) = ???
-  def test1 = foo([t] => (a: List[t]) ?=> ()) // POLYtype => GIVENMETHODType
+  def test1 = foo([t] => (using a: List[t]) => ()) // POLYtype => GIVENMETHODType
   def bar(f: [t] => List[t] => Unit) = ???
   def test2 = bar([t] => (a: List[t]) => ()) // POLYtype => METHODType
 

tests/run-macros/i9812b/Macro_1.scala

@@ -27,7 +27,7 @@ final case class CONS[+T](head: T, tail: Lst[T]) extends Lst[T]
 case object NIL extends Lst[Nothing]
 
 given IntLiftable[T <: Int] as Liftable[T]:
-  def toExpr(x: T): QuoteContext ?=> Expr[T] = qctx ?=> {
+  def toExpr(x: T): QuoteContext ?=> Expr[T] = (using qctx) => {
     import qctx.reflect._
     Literal(Constant.Int(x)).seal.asInstanceOf[Expr[T]]
   }

tests/run-staging/quote-nested-1.scala

@@ -4,7 +4,7 @@ import scala.quoted.staging._
 object Test {
   given Toolbox = Toolbox.make(getClass.getClassLoader)
   def main(args: Array[String]): Unit = withQuoteContext {
-    val q = '{ (qctx: QuoteContext) ?=> '{3} }
+    val q = '{ (using qctx: QuoteContext) => '{3} }
     println(q.show)
   }
 }

tests/run/i2146.scala

@@ -7,7 +7,7 @@ object Test {
   def foo[A, B]: A ?=> B ?=> (A, B) =
     (implicitly[A], implicitly[B])
 
-  def bar[A, B]: A ?=> B ?=> (A, B) = {(a: A) ?=>
+  def bar[A, B]: A ?=> B ?=> (A, B) = {(using a: A) =>
     (implicitly[A], implicitly[B])
   }
 

tests/run/i3448.scala

@@ -5,7 +5,7 @@ object Test extends App {
 
   val x: IF[Int] = implicitly[C].x
 
-  val xs0: List[IF[Int]] = List(_ ?=> x)
+  val xs0: List[IF[Int]] = List((using _) => x)
   val xs: List[IF[Int]] = List(x)
   val ys: IF[List[Int]] = xs.map(x => x)
   val zs = ys(using C(22))

tests/run/implicitFuns.scala

@@ -3,15 +3,15 @@ object Test {
 
     implicit val world: String = "world!"
 
-    val i1 = ((s: String) ?=> s.length > 2)
-    val i2 = {(s: String) ?=> s.length > 2}
+    val i1 = ((using s: String) => s.length > 2)
+    val i2 = {(using s: String) => s.length > 2}
 
     assert(i1)
     assert(i2)
 
-    val x: String ?=> Boolean = { (s: String) ?=> s.length > 2 }
+    val x: String ?=> Boolean = { (using s: String) => s.length > 2 }
 
-    val xx: (String, Int) ?=> Int = (x: String, y: Int) ?=> x.length + y
+    val xx: (String, Int) ?=> Int = (using x: String, y: Int) => x.length + y
 
     val y: String => Boolean = x(using _)
 

tests/run/polymorphic-functions.scala

@@ -88,7 +88,7 @@ object Test extends App {
     new Show[Int] {
       def show(t: Int): String = t.toString
     }
-  val s = [T] => (t: T) => (st: Show[T]) ?=> st.show(t)
+  val s = [T] => (t: T) => (using st: Show[T]) => st.show(t)
   assert(s(23) == "23")
 
   // Parens handling