Change tests to new syntax

Author: odersky

scala3doc-testcases/src/tests/FilterTest.scala

@@ -65,9 +65,9 @@ class FilterTestBase:
   given Map[String, Double] = Map.empty
 
   /** doc */
-  protected given namedSet as Set[String | Int] = Set(1, "ala")
+  protected given namedSet: Set[String | Int] = Set(1, "ala")
   /** doc */
-  given namedMap as Map[String, Double] = Map.empty
+  given namedMap: Map[String, Double] = Map.empty
 
 class FilterTest extends FilterTestBase with FilterTestBaseTrait:
   /** doc */
@@ -116,9 +116,9 @@ class FilterTest extends FilterTestBase with FilterTestBaseTrait:
   given List[String] = "ula" :: Nil
 
   /** doc */
-  given namedList as List[String] = "ula" :: Nil
+  given namedList: List[String] = "ula" :: Nil
   /** doc */
-  protected given namedSeq as Seq[String | Int | Double] = List(1)
+  protected given namedSeq: Seq[String | Int | Double] = List(1)
 
 extension (e: FilterTest):
   def extensionMethod(name: FilterTest): FilterTest = ???

scala3doc-testcases/src/tests/givenDRI.scala

@@ -10,25 +10,25 @@ given A[String]
 
 given A[Seq[String]]
 
-given [T: A] as A[Option[T]]
+given [T: A]: A[Option[T]] with {}
 
-given [T: B] as A[T]
+given [T: B]: A[T] with {}
 
-given [C] as A[C]
+given [C]: A[C] with {}
 
 given A[C]
 
-given [S <: C] as A[S]
+given [S <: C]: A[S] with {}
 
 class R:
   def a = 1
 
-given R as A[Int]:
+given R: A[Int] with
   def a = 2
 
 class S:
   class R:
     def a = 3
 
-  given R as A[Int]:
+  given R: A[Int] with
     def a = 5

scala3doc-testcases/src/tests/givenSignatures.scala

@@ -15,16 +15,16 @@ class GivenClass {
         extension (x: T) def < (y: T) = compare(x, y) < 0
         extension (x: T) def > (y: T) = compare(x, y) > 0
     }
-    given intOrd as Ord[Int] {
+    given intOrd: Ord[Int] with {
         def compare(x: Int, y: Int) =
             if (x < y) -1 else if (x > y) +1 else 0
     }
 
-    given asd(using int: Int) as B
+    given asd(using int: Int): B with {}
 
-    given asd2[T] as C[T]
+    given asd2[T]: C[T] with {}
 
-    given listOrd[T](using ord: Ord[T]) as Ord[List[T]] {
+    given listOrd[T](using ord: Ord[T]): Ord[List[T]] with {
 
         def compare(xs: List[T], ys: List[T]): Int = (xs, ys) match
             case (Nil, Nil) => 0
@@ -35,7 +35,7 @@ class GivenClass {
                 if (fst != 0) fst else compare(xs1, ys1)
     }
 
-    given IntOps as Int.type = Int
+    given IntOps: Int.type = Int
 
     given GivenType = GivenType()
 

scala3doc-testcases/src/tests/implicitConversions.scala

@@ -2,7 +2,7 @@ package tests
 
 package implicitConversions
 
-given Conversion[A, B] {
+given Conversion[A, B] with {
   def apply(a: A): B = ???
 }
 

scala3doc-testcases/src/tests/implicitConversions2.scala

@@ -29,7 +29,7 @@ class OuterClass //unexpected
       = ???
   }
 
-  given conversionFromVal as Conversion[ClassWithConversionFromVal, Methods] //unexpected
+  given conversionFromVal: Conversion[ClassWithConversionFromVal, Methods] with //unexpected
   {
     def apply(a: ClassWithConversionFromVal): Methods //unexpected
     = ???

scala3doc-testcases/src/tests/shadowingDRI.scala

@@ -7,4 +7,4 @@ class S:
   class R:
     def findThisDeclaration = 1
 
-  given R as A[B]
+  given R: A[B] with {}

tests/disabled/pos-macros/i7853/JsonEncoder_1.scala

@@ -35,15 +35,15 @@ object JsonEncoder {
       }
   }
 
-  given listEncoder[T](using encoder: JsonEncoder[T]) as JsonEncoder[List[T]] {
+  given listEncoder[T](using encoder: JsonEncoder[T]): JsonEncoder[List[T]] with {
     def encode(list: List[T]) = s"[${ list.map(v => encoder.encode(v)).mkString(", ") }]"
   }
 
-  given intEncoder as JsonEncoder[Int] {
+  given intEncoder: JsonEncoder[Int] with {
     def encode(value: Int) = value + ""
   }
 
-  given stringEncoder as JsonEncoder[String] {
+  given stringEncoder: JsonEncoder[String] with {
     def encode(value: String) = value
   }
 }

tests/disabled/pos/i7851.scala

@@ -1,14 +1,14 @@
 trait Wrappable[T] { }
-given Wrappable[Float] { }
+given Wrappable[Float] with { }
 
 case class Wrapped[T: Wrappable](value: T)
 
 trait Wrapper[T] { type WrappedT }
 object Wrapper { type Aux[T <: Tuple, WrappedT0 <: Tuple] = Wrapper[T] { type WrappedT = WrappedT0 } }
 
-given Wrapper[EmptyTuple] { type WrappedT = EmptyTuple }
+given Wrapper[EmptyTuple] with { type WrappedT = EmptyTuple }
 
-given [T: Wrappable] as Wrapper[T] { type WrappedT = Wrapped[T] }
+given [T: Wrappable]: Wrapper[T] with with { type WrappedT = Wrapped[T] }
 
 given [H: Wrappable, T <: Tuple, WrappedT0 <: Tuple]
       (using Wrapper.Aux[T, WrappedT0])

tests/disabled/pos/i8311.scala

@@ -8,8 +8,8 @@ class Foo
 
 object test:
 
-  given box[A](using Show[A]) as Show[Box[A]] = _.toString
-  given foo as Show[Foo] = _.toString
+  given box[A](using Show[A]): Show[Box[A]] = _.toString
+  given foo: Show[Foo] = _.toString
 
   def run(s: Box[Box[Foo]]): Unit =
     val x = summon[Show[Box[Box[Foo]]]]

tests/init/crash/i6914.scala

@@ -5,7 +5,7 @@ object test1 {
   class ToExpr[T](using Liftable[T]) extends Conversion[T, Expr[T]] {
     def apply(x: T): Expr[T] = ???
   }
-  given toExprFun[T](using Liftable[T]) as ToExpr[T]
+  given toExprFun[T](using Liftable[T]): ToExpr[T] with {}
 
   given Liftable[Int] = ???
   given Liftable[String] = ???
@@ -18,7 +18,7 @@ object test1 {
 
 object test2 {
 
-  given autoToExpr[T](using Liftable[T]) as Conversion[T, Expr[T]] {
+  given autoToExpr[T](using Liftable[T]): Conversion[T, Expr[T]] with {
     def apply(x: T): Expr[T] = ???
   }
 

tests/init/crash/i7821.scala

@@ -3,7 +3,7 @@ object XObject {
 
   def anX: X = 5
 
-  given ops as Object {
+  given ops: Object with {
     extension (x: X) def + (y: X): X = x + y
   }
 }
@@ -13,7 +13,7 @@ object MyXObject {
 
   def anX: MyX = XObject.anX
 
-  given ops as Object {
+  given ops: Object with {
     extension (x: MyX) def + (y: MyX): MyX = x + y // error: warring: Infinite recursive call
   }
 }

tests/neg-custom-args/fatal-warnings/i7821.scala

@@ -3,7 +3,7 @@ object XObject {
 
   def anX: X = 5
 
-  given ops as Object {
+  given ops: Object with {
     extension (x: X) def + (y: X): X = x + y
   }
 }
@@ -13,7 +13,7 @@ object MyXObject {
 
   def anX: MyX = XObject.anX
 
-  given ops as Object {
+  given ops: Object with {
     extension (x: MyX) def + (y: MyX): MyX = x + y // error: warring: Infinite recursive call
   }
 }

tests/neg-custom-args/impl-conv/A.scala

@@ -3,7 +3,7 @@ package implConv
 object A {
 
   implicit def s2i(x: String): Int = Integer.parseInt(x) // error: feature
-  given i2s as Conversion[Int, String] = _.toString // ok
+  given i2s: Conversion[Int, String] = _.toString // ok
 
   implicit class Foo(x: String) {
     def foo = x.length

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

@@ -3,19 +3,19 @@ class B
 
 object A {
 
-  given Conversion[A, B] {
+  given Conversion[A, B] with {
     def apply(x: A): B = ???
   }
 
-  given Conversion[B, A] {
+  given Conversion[B, A] with {
     def apply(x: B): A = ???
   }
 }
 
 class C
 
 object D {
-  given Conversion[A, C] {
+  given Conversion[A, C] with {
     def apply(x: A): C = ???
   }
 }

tests/neg-macros/BigFloat/BigFloat_1.scala

@@ -35,15 +35,15 @@ object BigFloat extends App {
     def fromDigits(digits: String) = apply(digits)
   }
 
-  given BigFloatFromDigits {
+  given BigFloatFromDigits with {
     override inline def fromDigits(digits: String) = ${
       BigFloatFromDigitsImpl('digits)
     }
   }
 
   // Should be in StdLib:
 
-  given Liftable[BigInt] {
+  given Liftable[BigInt] with {
     def toExpr(x: BigInt) =
       '{BigInt(${Expr(x.toString)})}
   }

tests/neg-macros/GenericNumLits/Even_1.scala

@@ -16,7 +16,7 @@ object Even {
     def fromDigits(digits: String) = evenFromDigits(digits)
   }
 
-  given EvenFromDigits {
+  given EvenFromDigits with {
     override inline def fromDigits(digits: String) = ${
       EvenFromDigitsImpl('digits)
     }

tests/neg-macros/i4044b.scala

@@ -4,13 +4,13 @@ def test(using Quotes) = {
 
   '{
     val qctx: Quotes = ???
-    given x1 as qctx.type = qctx
+    given x1: qctx.type = qctx
 
     val b = '{3}
 
     '{
       val qctx: Quotes = ???
-      given x2 as qctx.type = qctx
+      given x2: qctx.type = qctx
 
       b // error
       ${b}

tests/neg-macros/i7919.scala

@@ -3,7 +3,7 @@ import scala.quoted._
 object Test {
   def staged[T](using Quotes) = {
     import quotes.reflect._
-    given typeT as Type[T] // error
+    given typeT as Type[T] with {} // error
     val tt = TypeRepr.of[T]
     '{ "in staged" }
   }

tests/neg-with-compiler/GenericNumLits/Even_1.scala

@@ -16,7 +16,7 @@ object Even {
     def fromDigits(digits: String) = evenFromDigits(digits)
   }
 
-  given EvenFromDigits {
+  given EvenFromDigits with {
     override inline def fromDigits(digits: String) = ${
       EvenFromDigitsImpl('digits)
     }

tests/neg/eql.scala

@@ -1,7 +1,7 @@
 object lst:
   opaque type Lst[+T] = Any
   object Lst:
-    given lstCanEqual[T, U] as CanEqual[Lst[T], Lst[U]] = CanEqual.derived
+    given lstCanEqual[T, U]: CanEqual[Lst[T], Lst[U]] = CanEqual.derived
     val Empty: Lst[Nothing] = ???
 end lst
 

tests/neg/exports.scala

@@ -5,7 +5,7 @@
     type PrinterType
     def print(bits: BitMap): Unit = ???
     def status: List[String] = ???
-    given bitmap as BitMap
+    given bitmap: BitMap with {}
   }
 
   class Scanner {

tests/neg/gadt-approximation-interaction.scala

@@ -28,7 +28,7 @@ object GivenLookup {
 
   class Tag[T]
 
-  given ti as Tag[Int]
+  given ti: Tag[Int] with {}
 
   def foo[T](t: T, ev: T SUB Int) =
     ev match { case SUB.Refl() =>

tests/neg/genericNumbers.scala

@@ -7,7 +7,7 @@ object Test extends App {
 
   case class Even(n: Int)
 
-  given FromDigits[Even] {
+  given FromDigits[Even] with {
     def fromDigits(digits: String): Even = {
       val intValue = digits.toInt
       if (intValue % 2 == 0) Even(intValue)

tests/neg/i10074.scala

@@ -1,3 +1,3 @@
 class Context
 given Context = ???  // ok
-given as Context = ???     // error // error // error
+given: Context = ???     // error

tests/neg/i5978.scala

@@ -5,7 +5,7 @@ opaque type Position[Buffer] = Int
 trait TokenParser[Token, R]
 
 object TextParser {
-  given TP as TokenParser[Char, Position[CharSequence]] {}
+  given TP: TokenParser[Char, Position[CharSequence]] with {}
 
   given FromCharToken(using T: TokenParser[Char, Position[CharSequence]])
     as Conversion[Char, Position[CharSequence]] = ???
@@ -21,7 +21,7 @@ object Testcase {
     val co_x : Position[CharSequence] = 'x'                   // error
 
     {
-      given XXX as Conversion[Char, Position[CharSequence]] = co_i
+      given XXX: Conversion[Char, Position[CharSequence]] = co_i
       val co_y : Position[CharSequence] = 'x'
     }
   }

tests/neg/i7078.scala

@@ -1,7 +1,7 @@
 trait A
 class B extends A
 
-transparent given g1 as A = B()  // error: `transparent` can only be used in conjunction with `inline`
+transparent given g1: A = B()  // error: `transparent` can only be used in conjunction with `inline`
 
-inline given g2 as _ <: A:  // error: `=' expected
+inline given g2: _ <: A:  // error: `=' expected // error
   def foo = 2

tests/neg/i7248.scala

@@ -1,4 +1,4 @@
 object Test extends App {
-  given f[H](using h: H) as H = h
+  given f[H](using h: H): H = h
   summon[Int]  // error
 }

tests/neg/i7249.scala

@@ -4,6 +4,6 @@ trait F[H, T]
 
 
 object Test extends App {
-  given f[H, T](using h: H, t: T) as F[H, T] = ???
+  given f[H, T](using h: H, t: T): F[H, T] = ???
   summon[F[Int, Unit]]  // error
 }