Change more files to new syntax

Author: odersky

compiler/src/dotty/tools/dotc/semanticdb/Scala3.scala

@@ -212,7 +212,7 @@ object Scala3 with
   // end RangeOps
 
   /** Sort symbol occurrences by their start position. */
-  given OccurrenceOrdering: Ordering[SymbolOccurrence] = (x, y) =>
+  given OccurrenceOrdering as Ordering[SymbolOccurrence] = (x, y) =>
     x.range -> y.range match
     case None -> _ | _ -> None => 0
     case Some(a) -> Some(b) =>

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -1302,7 +1302,7 @@ class Typer extends Namer
   }
 
   def typedWhileDo(tree: untpd.WhileDo)(implicit ctx: Context): Tree = {
-    given whileCtx: Context = Nullables.whileContext(tree.span)(using ctx)
+    given whileCtx as Context = Nullables.whileContext(tree.span)(using ctx)
     val cond1 =
       if (tree.cond eq EmptyTree) EmptyTree
       else typed(tree.cond, defn.BooleanType)

tests/neg/i5978.scala

@@ -11,7 +11,6 @@ object TextParser {
     as Conversion[Char, Position[CharSequence]] = ???
 }
 
-
 object Testcase {
   def main(args: Array[String]): Unit = {
     import TextParser._

tests/neg/i7078.scala

@@ -1,8 +1,8 @@
 trait A
 class B extends A
 
-given g1 as _ <: A = B()  // error: `<:' is only allowed for given with `inline' modifier // error
-
-inline given g2 as _ <: A  // error: <: A is not a class type
-  def foo = 2    // error: `=' expected
+given g1 as _ <: A = B()  // error: `_ <:' is only allowed for given with `inline' modifier // error
 
+inline given g2 as _ <: A:  // error: `=' expected
+  def foo = 2
+// error

tests/pos-custom-args/erased/i7868.scala

@@ -11,13 +11,14 @@ object Coproduct {
 
   object At {
 
-    given atHead[Head, Tail]: At[Head +: Tail, Head, 0] {
+    given atHead[Head, Tail] as At[Head +: Tail, Head, 0] {
       def cast: Head <:< Head +: Tail = summon[Head <:< Head +: Tail]
     }
 
-    given atTail[Head, Tail, Value, NextIndex <: Int](using atNext: At[Tail, Value, NextIndex]) as At[Head +: Tail, Value, S[NextIndex]] {
+    given atTail[Head, Tail, Value, NextIndex <: Int]
+          (using atNext: At[Tail, Value, NextIndex])
+          as At[Head +: Tail, Value, S[NextIndex]]:
       val cast: Value <:< Head +: Tail = atNext.cast
-    }
 
     given [A](using A) as (() => A)= { () => summon[A]}
   }

tests/pos-custom-args/erased/i7878.scala

@@ -2,7 +2,7 @@ object Boom {
   import scala.compiletime._
   trait Fail[A <: Int, B <: Int]
 
-  erased inline given fail[X <: Int, Y <: Int]: Fail[X, Y] = {
+  erased inline given fail[X <: Int, Y <: Int] as Fail[X, Y] = {
      scala.compiletime.summonFrom {
        case t: Fail[X, y] if constValue[y] < constValue[Y] => ???
     }

tests/pos/combine.scala

@@ -2,7 +2,7 @@ trait Semigroup[A] {
   def (x: A).combine(y: A): A
 }
 given Semigroup[Int] = ???
-given [A, B](using Semigroup[A], Semigroup[B]): Semigroup[(A, B)]  = ???
+given [A, B](using Semigroup[A], Semigroup[B]) as Semigroup[(A, B)]  = ???
 object Test extends App {
   ((1, 1)) combine ((2, 2)) // doesn't compile
   ((1, 1): (Int, Int)) combine (2, 2) // compiles

tests/pos/i7851.scala

@@ -8,11 +8,12 @@ object Wrapper { type Aux[T <: Tuple, WrappedT0 <: Tuple] = Wrapper[T] { type Wr
 
 given Wrapper[Unit] { type WrappedT = Unit }
 
-given [T: Wrappable]: Wrapper[T] { type WrappedT = Wrapped[T] }
+given [T: Wrappable] as Wrapper[T] { type WrappedT = Wrapped[T] }
 
-given [H: Wrappable, T <: Tuple, WrappedT0 <: Tuple](using Wrapper.Aux[T, WrappedT0]): Wrapper[H *: T] {
+given [H: Wrappable, T <: Tuple, WrappedT0 <: Tuple]
+      (using Wrapper.Aux[T, WrappedT0])
+      as Wrapper[H *: T]:
   type WrappedT = Wrapped[H] *: WrappedT0
-}
 
 def wrappedFunction[F, FArgs <: Tuple, WrapperFArgs <: Tuple, R: Wrappable](
   function: F

tests/pos/i8198.scala

@@ -5,6 +5,6 @@ trait Eq[A] {
 
 case class Id[T](id: T)
 
-given idEq[A](using eqA: Eq[A]): Eq[Id[A]] = new {
+given idEq[A](using eqA: Eq[A]) as Eq[Id[A]] = new {
   def (i1: Id[A]) === (i2: Id[A]) = !(i1.id /== i2.id)
 }

tests/pos/multi-given.scala

@@ -7,4 +7,4 @@ def foo(implicit a: A, b: B, c: C) = "foo"
 
 given A, B {}
 
-given ops: A with B {}
+given ops as A with B {}

tests/run-macros/i6988/FirstArg_1.scala

@@ -2,7 +2,7 @@ package foo
 
 case class FirstArg(value: Any, source: String)
 object FirstArg {
-  inline given create: FirstArg = ${Macros.argsImpl}
+  inline given create as FirstArg = ${Macros.argsImpl}
 }
 
 object Macros {

tests/run-macros/i8007/Macro_3.scala

@@ -32,7 +32,7 @@ object Eq {
     case '[Unit] => Nil
   }
 
-  given derived[T: Type](using qctx: QuoteContext): Expr[Eq[T]] = {
+  given derived[T: Type](using qctx: QuoteContext) as Expr[Eq[T]] = {
     import qctx.tasty.{_, given}
 
     val ev: Expr[Mirror.Of[T]] = summonExpr(using '[Mirror.Of[T]]).get

tests/semanticdb/expect/Givens.expect.scala

@@ -22,6 +22,6 @@ object Givens/*<-a::b::Givens.*/:
    /*<-a::b::Givens.given_Monoid_String.*//*->a::b::Givens.Monoid#*//*->scala::Predef.String#*/ def empty/*<-a::b::Givens.given_Monoid_String.empty().*/ = ""
     def (x: Str/*<-a::b::Givens.given_Monoid_String.combine().*//*<-a::b::Givens.given_Monoid_String.combine().(x)*/ing/*->scala::Predef.String#*/).combine(y/*<-a::b::Givens.given_Monoid_String.combine().(y)*/: String/*->scala::Predef.String#*/) = x/*->a::b::Givens.given_Monoid_String.combine().(x)*/ +/*->java::lang::String#`+`().*/ y/*->a::b::Givens.given_Monoid_String.combine().(y)*/
 
-  inline given int2String/*<-a::b::Givens.int2String().*/: Conversion/*->scala::Conversion#*/[Int/*->scala::Int#*/, String/*->scala::Predef.String#*/] = _.toString/*->scala::Any#toString().*/
+  inline given int2String/*<-a::b::Givens.int2String().*/ as Conversion/*->scala::Conversion#*/[Int/*->scala::Int#*/, String/*->scala::Predef.String#*/] = _.toString/*->scala::Any#toString().*/
 
   def foo/*<-a::b::Givens.foo().*/[A/*<-a::b::Givens.foo().[A]*/](using A/*<-a::b::Givens.foo().(A)*/: Monoid/*->a::b::Givens.Monoid#*/[A/*->a::b::Givens.foo().[A]*/]): A/*->a::b::Givens.foo().[A]*/ = A/*->a::b::Givens.foo().(A)*/.combine/*->a::b::Givens.Monoid#combine().*/(A/*->a::b::Givens.foo().(A)*/.empty/*->a::b::Givens.Monoid#empty().*/)(A/*->a::b::Givens.foo().(A)*/.empty/*->a::b::Givens.Monoid#empty().*/)

tests/semanticdb/expect/Givens.scala

@@ -22,6 +22,6 @@ object Givens:
     def empty = ""
     def (x: String).combine(y: String) = x + y
 
-  inline given int2String: Conversion[Int, String] = _.toString
+  inline given int2String as Conversion[Int, String] = _.toString
 
   def foo[A](using A: Monoid[A]): A = A.combine(A.empty)(A.empty)

tests/semanticdb/metac.expect

@@ -1361,10 +1361,10 @@ Occurrences:
 [22:43..22:44): + -> java/lang/String#`+`().
 [22:45..22:46): y -> a/b/Givens.given_Monoid_String.combine().(y)
 [24:15..24:25): int2String <- a/b/Givens.int2String().
-[24:27..24:37): Conversion -> scala/Conversion#
-[24:38..24:41): Int -> scala/Int#
-[24:43..24:49): String -> scala/Predef.String#
-[24:55..24:63): toString -> scala/Any#toString().
+[24:29..24:39): Conversion -> scala/Conversion#
+[24:40..24:43): Int -> scala/Int#
+[24:45..24:51): String -> scala/Predef.String#
+[24:57..24:65): toString -> scala/Any#toString().
 [26:6..26:9): foo <- a/b/Givens.foo().
 [26:10..26:11): A <- a/b/Givens.foo().[A]
 [26:19..26:20): A <- a/b/Givens.foo().(A)