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] = ???
   }