Skip to content

Commit b9e39c5

Browse files
oderskyodersky
committed
Switch more tests to postfix as
1 parent 924672b commit b9e39c5

25 files changed

+43
-43
lines changed

‎scala3doc-testcases/src/tests/givenDRI.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ given A[String]
1010

1111
given A[Seq[String]]
1212

13-
given [T: A] as A[Option[T]]
13+
given [T: A] => A[Option[T]]
1414

15-
given [T: B] as A[T]
15+
given [T: B] => A[T]
1616

17-
given [C] as A[C]
17+
given [C] => A[C]
1818

1919
given A[C]
2020

21-
given [S <: C] as A[S]
21+
given [S <: C] => A[S]
2222

2323
class R:
2424
def a = 1

‎tests/neg/i8623.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ trait QC:
66
def pos: Tree = ???
77

88
def test =
9-
given [T] as QC = ???
9+
given [T] => QC = ???
1010
def unseal(using qctx: QC): qctx.tasty.Tree = ???
1111
unseal.pos // error
1212

‎tests/neg/multi-param-derives.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ object Test extends App {
55
trait Show[T]
66
object Show {
77
given Show[Int] {}
8-
given [T](using st: Show[T]) as Show[Tuple1[T]] {}
8+
given [T] => (st: Show[T]) => Show[Tuple1[T]] {}
99
given t2[T, U](using st: Show[T], su: Show[U]) as Show[(T, U)] {}
1010
given t3[T, U, V](using st: Show[T], su: Show[U], sv: Show[V]) as Show[(T, U, V)] {}
1111

@@ -22,7 +22,7 @@ object Test extends App {
2222
{
2323
trait Functor[F[_]]
2424
object Functor {
25-
given [C] as Functor[[T] =>> C] {}
25+
given [C] => Functor[[T] =>> C] {}
2626
given Functor[[T] =>> Tuple1[T]] {}
2727
given t2 [T] as Functor[[U] =>> (T, U)] {}
2828
given t3 [T, U] as Functor[[V] =>> (T, U, V)] {}
@@ -40,8 +40,8 @@ object Test extends App {
4040
{
4141
trait FunctorK[F[_[_]]]
4242
object FunctorK {
43-
given [C] as FunctorK[[F[_]] =>> C] {}
44-
given [T] as FunctorK[[F[_]] =>> Tuple1[F[T]]]
43+
given [C] => FunctorK[[F[_]] =>> C] {}
44+
given [T] => FunctorK[[F[_]] =>> Tuple1[F[T]]]
4545

4646
def derived[F[_[_]]](using m: Mirror { type MirroredType[X[_]] = F[X] ; type MirroredElemTypes[_[_]] }, r: FunctorK[m.MirroredElemTypes]): FunctorK[F] = new FunctorK[F] {}
4747
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ object Coproduct {
2121
as At[Head +: Tail, Value, S[NextIndex]]:
2222
val cast: Value <:< Head +: Tail = atNext.cast
2323

24-
given [A](using A) as (() => A)= { () => summon[A]}
24+
given [A] => (A) => (() => A)= { () => summon[A]}
2525
}
2626

2727
def upCast[A, B](a: A)(using erased evidence: (A <:< B) ): B = a.asInstanceOf[B]

‎tests/pos-macros/macro-docs.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ object MacrosMD_Liftable {
1717
}
1818
}
1919

20-
given [T: Liftable : Type] as Liftable[List[T]] {
20+
given [T: Liftable : Type] => Liftable[List[T]] {
2121
def toExpr(xs: List[T]) = xs match {
2222
case head :: tail => '{ ${ Expr(head) } :: ${ toExpr(tail) } }
2323
case Nil => '{ Nil: List[T] }

‎tests/pos/X.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import scala.deriving._
22

33
trait FunctorK[F[_[_]]]
44
object FunctorK {
5-
given [C] as FunctorK[[F[_]] =>> C] {}
6-
given [T] as FunctorK[[F[_]] =>> Tuple1[F[T]]]
5+
given [C] => FunctorK[[F[_]] =>> C] {}
6+
given [T] => FunctorK[[F[_]] =>> Tuple1[F[T]]]
77

88
def derived[F[_[_]]](using m: Mirror { type MirroredType[X[_]] = F[X] ; type MirroredElemTypes[_[_]] }, r: FunctorK[m.MirroredElemTypes]): FunctorK[F] = new FunctorK[F] {}
99
}

‎tests/pos/combine.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ trait Semigroup[A] {
22
extension (x: A) def combine(y: A): A
33
}
44
given Semigroup[Int] = ???
5-
given [A, B](using Semigroup[A], Semigroup[B]) as Semigroup[(A, B)] = ???
5+
given [A, B] => (Semigroup[A], Semigroup[B]) => Semigroup[(A, B)] = ???
66
object Test extends App {
77
((1, 1)) combine ((2, 2)) // doesn't compile
88
((1, 1): (Int, Int)) combine (2, 2) // compiles

‎tests/pos/givenFallback.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
trait TC[T] { def x: Int; def y: Int = 0 }
22

3-
given [T] as TC[T] {
3+
given [T] => TC[T] {
44
inline val x = 1
55
}
66

‎tests/pos/i6864.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ trait C
1414
trait Baz[A]
1515

1616
given C
17-
given [A] as Baz[A]
17+
given [A] => Baz[A]

‎tests/pos/i6900.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ object Test1 {
88

99
// But not with newstyle
1010
/*
11-
given [A] as Conversion[A, Foo[A]]:
11+
given [A] => Conversion[A, Foo[A]]:
1212
def apply(a: A) = new Foo[A]:
1313
def foo[C]: C => A = _ => a
1414
*/

‎tests/pos/i6938.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
trait Foo[T]
22
object Foo:
3-
given [T] as Foo[Tuple1[T]]
4-
given [T, U] as Foo[(T, U)]
5-
given [T, U, V] as Foo[(T, U, V)]
3+
given [T] => Foo[Tuple1[T]]
4+
given [T, U] => Foo[(T, U)]
5+
given [T, U, V] => Foo[(T, U, V)]

‎tests/pos/i8344-1.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ enum Datatype[T] {
55
}
66

77
object Datatype {
8-
given [H, T <: STuple](using ht: Datatype[H], tt: Datatype[T]) as Datatype[H *: T] = tt match {
8+
given [H, T <: STuple] => (ht: Datatype[H], tt: Datatype[T]) => Datatype[H *: T] = tt match {
99
case Datatype.Tuple(elems) => Datatype.Tuple(ht *: elems)
1010
}
1111
}

‎tests/pos/i8397.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ given foo(using x: Int) as AnyRef:
66
trait Lub2[A, B]:
77
type Output
88

9-
given [A <: C, B <: C, C] as Lub2[A, B]:
9+
given [A <: C, B <: C, C] => Lub2[A, B]:
1010
type Output = C
1111

1212
trait Lub[Union]:
1313
type Output
1414

15-
given [A] as Lub[A]:
15+
given [A] => Lub[A]:
1616
type Output = A
1717

1818
given [Left, Right](

‎tests/pos/i9342b.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
trait Label[A]:
22
def apply(v: A): String
33

4-
given [A] as Label[A] = _.toString
4+
given [A] => Label[A] = _.toString
55

66
extension [A](x: A) inline def label(using inline l: Label[A]): String = l(x)
77

‎tests/pos/multiversal.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
object Test {
22
import scala.CanEqual
33

4-
given [X, Y](using CanEqual[X, Y]) as CanEqual[List[X], List[Y]] = CanEqual.derived
4+
given [X, Y] => (CanEqual[X, Y]) => CanEqual[List[X], List[Y]] = CanEqual.derived
55

66
val b: Byte = 1
77
val c: Char = 2

‎tests/pos/reference/delegates.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ object AnonymousInstances extends Common:
145145
extension (x: Int) def compareTo(y: Int) =
146146
if (x < y) -1 else if (x > y) +1 else 0
147147

148-
given [T: Ord] as Ord[List[T]]:
148+
given [T: Ord] => Ord[List[T]]:
149149
extension (xs: List[T]) def compareTo(ys: List[T]): Int = (xs, ys).match
150150
case (Nil, Nil) => 0
151151
case (Nil, _) => -1
@@ -162,7 +162,7 @@ object AnonymousInstances extends Common:
162162
extension [T](xs: List[T])
163163
def second = xs.tail.head
164164

165-
given [From, To](using c: Convertible[From, To]) as Convertible[List[From], List[To]]:
165+
given [From, To] => (c: Convertible[From, To]) => Convertible[List[From], List[To]]:
166166
extension (x: List[From]) def convert: List[To] = x.map(c.convert)
167167

168168
given Monoid[String]:

‎tests/run-macros/i7048/Lib_1.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ trait IsExpr[T] {
55
def toExpr(x: T): Expr[Underlying]
66
}
77

8-
given [U] as IsExpr[Expr[U]] = new IsExpr[Expr[U]] {
8+
given [U] => IsExpr[Expr[U]] = new IsExpr[Expr[U]] {
99
type Underlying = U
1010
def toExpr(x: Expr[U]): Expr[U] = x
1111
}

‎tests/run/fragables-extension.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ given Fragable[Int] =
1111
x => List(IntFrag(x))
1212
given Fragable[String] =
1313
x => List(StringFrag(x))
14-
given [A: Fragable] as Fragable[List[A]] =
14+
given [A: Fragable] => Fragable[List[A]] =
1515
x => x.flatMap(_.toFrags)
1616
given Fragable[EmptyTuple] =
1717
x => Nil
18-
given [A: Fragable, B <: Tuple: Fragable] as Fragable[A *: B] =
18+
given [A: Fragable, B <: Tuple: Fragable] => Fragable[A *: B] =
1919
x => x.head.toFrags ++ x.tail.toFrags
2020

2121
def f[T: Fragable](x: T) =

‎tests/run/i7788.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ given Show[Int] = _.toString
66

77
given showEither[A,B](using sA: Show[A])(using Show[B]) as Show[Either[A,B]] =
88
_.fold(a => s"Left(${summon[Show[A]].show(a)})", b => s"Right(${summon[Show[B]].show(b)})")
9-
given [A,B](using sA: Show[A])(using sB: Show[B]) as Show[(A,B)] = (a,b) => s"(${sA.show(a)}), ${sB.show(b)})"
9+
given [A,B] => (sA: Show[A]) => (sB: Show[B]) => Show[(A,B)] = (a,b) => s"(${sA.show(a)}), ${sB.show(b)})"
1010

1111

1212
@main def Test =

‎tests/run/instances-anonymous.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ object Test extends App {
6969
val minimum = Int.MinValue
7070
}
7171

72-
given [T: Ord] as Ord[List[T]] {
72+
given [T: Ord] => Ord[List[T]] {
7373
extension (xs: List[T]) def compareTo(ys: List[T]): Int = (xs, ys).match {
7474
case (Nil, Nil) => 0
7575
case (Nil, _) => -1
@@ -108,7 +108,7 @@ object Test extends App {
108108
List(x)
109109
}
110110

111-
given [Ctx] as Monad[[X] =>> Ctx => X] {
111+
given [Ctx] => Monad[[X] =>> Ctx => X] {
112112
extension [A, B](r: Ctx => A) def flatMap (f: A => Ctx => B): Ctx => B =
113113
ctx => f(r(ctx))(ctx)
114114
def pure[A](x: A): Ctx => A =

‎tests/run/poly-kinded-derives.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ object Test extends App {
55
trait Show[T]
66
object Show {
77
given Show[Int] {}
8-
given [T](using st: Show[T]) as Show[Tuple1[T]]
8+
given [T] => (st: Show[T]) => Show[Tuple1[T]]
99
given t2[T, U](using st: Show[T], su: Show[U]) as Show[(T, U)]
1010
given t3 [T, U, V](using st: Show[T], su: Show[U], sv: Show[V]) as Show[(T, U, V)]
1111

@@ -22,7 +22,7 @@ object Test extends App {
2222
{
2323
trait Functor[F[_]]
2424
object Functor {
25-
given [C] as Functor[[T] =>> C] {}
25+
given [C] => Functor[[T] =>> C] {}
2626
given Functor[[T] =>> Tuple1[T]] {}
2727
given t2 [T] as Functor[[U] =>> (T, U)] {}
2828
given t3 [T, U] as Functor[[V] =>> (T, U, V)] {}
@@ -40,8 +40,8 @@ object Test extends App {
4040
{
4141
trait FunctorK[F[_[_]]]
4242
object FunctorK {
43-
given [C] as FunctorK[[F[_]] =>> C] {}
44-
given [T] as FunctorK[[F[_]] =>> Tuple1[F[T]]]
43+
given [C] => FunctorK[[F[_]] =>> C] {}
44+
given [T] => FunctorK[[F[_]] =>> Tuple1[F[T]]]
4545

4646
def derived[F[_[_]]](using m: Mirror { type MirroredType[X[_]] = F[X] ; type MirroredElemTypes[_[_]] }, r: FunctorK[m.MirroredElemTypes]): FunctorK[F] = new FunctorK[F] {}
4747
}
@@ -56,7 +56,7 @@ object Test extends App {
5656
{
5757
trait Bifunctor[F[_, _]]
5858
object Bifunctor {
59-
given [C] as Bifunctor[[T, U] =>> C] {}
59+
given [C] => Bifunctor[[T, U] =>> C] {}
6060
given Bifunctor[[T, U] =>> Tuple1[U]] {}
6161
given Bifunctor[[T, U] =>> (T, U)] as t2 {}
6262
given [T] => Bifunctor[[U, V] =>> (T, U, V)] as t3 {}

‎tests/run/string-context-implicits-with-conversion.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ object Lib {
44

55
opaque type Showed = String
66

7-
given [T](using show: Show[T]) as Conversion[T, Showed] = x => show(x)
7+
given [T] => (show: Show[T]) => Conversion[T, Showed] = x => show(x)
88

99
trait Show[T] {
1010
def apply(x: T): String

‎tests/run/tagless.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ object Test extends App {
196196
// Added operation: negation pushdown
197197
enum NCtx { case Pos, Neg }
198198

199-
given [T](using e: Exp[T]) as Exp[NCtx => T] {
199+
given [T] => (e: Exp[T]) => Exp[NCtx => T] {
200200
import NCtx._
201201
def lit(i: Int) = {
202202
case Pos => e.lit(i)
@@ -216,7 +216,7 @@ object Test extends App {
216216
println(pushNeg(tf1[NCtx => String]))
217217
println(pushNeg(pushNeg(pushNeg(tf1))): String)
218218

219-
given [T](using e: Mult[T]) as Mult[NCtx => T] {
219+
given [T] => (e: Mult[T]) => Mult[NCtx => T] {
220220
import NCtx._
221221
def mul(l: NCtx => T, r: NCtx => T): NCtx => T = {
222222
case Pos => e.mul(l(Pos), r(Pos))

‎tests/semanticdb/expect/Enums.expect.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ object Enums/*<-_empty_::Enums.*/:
4747
case Refl/*<-_empty_::Enums.`<:<`.Refl#*/[C/*<-_empty_::Enums.`<:<`.Refl#[C]*/]() extends (C/*->_empty_::Enums.`<:<`.Refl#[C]*/ <:</*->_empty_::Enums.`<:<`#*/ C/*->_empty_::Enums.`<:<`.Refl#[C]*/)
4848

4949
object <:</*<-_empty_::Enums.`<:<`.*/ :
50-
given [T] as /*<-_empty_::Enums.`<:<`.given_T().*//*<-_empty_::Enums.`<:<`.given_T().[T]*/(T/*->_empty_::Enums.`<:<`.given_T().[T]*/ <:</*->_empty_::Enums.`<:<`#*/ T/*->_empty_::Enums.`<:<`.given_T().[T]*/) = Refl/*->_empty_::Enums.`<:<`.Refl.*//*->_empty_::Enums.`<:<`.Refl.apply().*/()
50+
given [T] => /*<-_empty_::Enums.`<:<`.given_T().*//*<-_empty_::Enums.`<:<`.given_T().[T]*/(T/*->_empty_::Enums.`<:<`.given_T().[T]*/ <:</*->_empty_::Enums.`<:<`#*/ T/*->_empty_::Enums.`<:<`.given_T().[T]*/) = Refl/*->_empty_::Enums.`<:<`.Refl.*//*->_empty_::Enums.`<:<`.Refl.apply().*/()
5151

5252
extension [A/*<-_empty_::Enums.unwrap().[A]*/, B/*<-_empty_::Enums.unwrap().[B]*/](opt/*<-_empty_::Enums.unwrap().(opt)*/: Option/*->scala::Option#*/[A/*->_empty_::Enums.unwrap().[A]*/]) def unwrap/*<-_empty_::Enums.unwrap().*/(using ev/*<-_empty_::Enums.unwrap().(ev)*/: A/*->_empty_::Enums.unwrap().[A]*/ <:</*->_empty_::Enums.`<:<`#*/ Option/*->scala::Option#*/[B/*->_empty_::Enums.unwrap().[B]*/]): Option/*->scala::Option#*/[B/*->_empty_::Enums.unwrap().[B]*/] = ev/*->_empty_::Enums.unwrap().(ev)*/ match
5353
case Refl/*->_empty_::Enums.`<:<`.Refl.*//*->_empty_::Enums.`<:<`.Refl.unapply().*/() => opt/*->_empty_::Enums.unwrap().(opt)*/.flatMap/*->scala::Option#flatMap().*/(identity/*->scala::Predef.identity().*//*->local0*/[Option/*->scala::Option#*/[B/*->_empty_::Enums.unwrap().[B]*/]])

‎tests/semanticdb/expect/Enums.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ object Enums:
4747
case Refl[C]() extends (C <:< C)
4848

4949
object <:< :
50-
given [T] as (T <:< T) = Refl()
50+
given [T] => (T <:< T) = Refl()
5151

5252
extension [A, B](opt: Option[A]) def unwrap(using ev: A <:< Option[B]): Option[B] = ev match
5353
case Refl() => opt.flatMap(identity[Option[B]])

0 commit comments

Comments
 (0)