Skip to content

Commit 03c01c1

Browse files
authored
Merge pull request #11503 from dotty-staging/fix-11502
Fix #11052: use latest varargs pattern syntax
2 parents 59eaeaf + 9fe17af commit 03c01c1

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

compiler/src/dotty/tools/dotc/transform/patmat/Space.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -762,9 +762,9 @@ class SpaceEngine(using Context) extends SpaceLogic {
762762
if (ctx.definitions.isTupleType(tp))
763763
params(tp).map(_ => "_").mkString("(", ", ", ")")
764764
else if (scalaListType.isRef(sym))
765-
if (flattenList) "_: _*" else "_: List"
765+
if (flattenList) "_*" else "_: List"
766766
else if (scalaConsType.isRef(sym))
767-
if (flattenList) "_, _: _*" else "List(_, _: _*)"
767+
if (flattenList) "_, _*" else "List(_, _*)"
768768
else if (tp.classSymbol.is(Sealed) && tp.classSymbol.hasAnonymousChild)
769769
"_: " + showType(tp) + " (anonymous)"
770770
else if (tp.classSymbol.is(CaseClass) && !hasCustomUnapply(tp.classSymbol))

tests/patmat/exhausting.check

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
21: Pattern Match Exhaustivity: List(_, _, _, _: _*), List(_)
1+
21: Pattern Match Exhaustivity: List(_, _, _, _*), List(_)
22
27: Pattern Match Exhaustivity: Nil
3-
32: Pattern Match Exhaustivity: List(_, _: _*)
3+
32: Pattern Match Exhaustivity: List(_, _*)
44
39: Pattern Match Exhaustivity: Bar3
55
44: Pattern Match Exhaustivity: (Bar2, Bar2)
66
50: Pattern Match Exhaustivity: (Bar2, Bar2)

tests/patmat/i2363.check

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
15: Pattern Match Exhaustivity: List(_, _: _*)
2-
21: Pattern Match Exhaustivity: _: Expr
1+
15: Pattern Match Exhaustivity: List(_, _*)
2+
21: Pattern Match Exhaustivity: _: Expr

tests/patmat/t10019.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
2: Pattern Match Exhaustivity: (List(_, _, _: _*), List(_, _: _*)), (Nil, List(_, _: _*)), (List(_, _: _*), List(_, _, _: _*)), (List(_, _: _*), Nil)
1+
2: Pattern Match Exhaustivity: (List(_, _, _*), List(_, _*)), (Nil, List(_, _*)), (List(_, _*), List(_, _, _*)), (List(_, _*), Nil)
22
11: Pattern Match Exhaustivity: (Foo(None), Foo(_))

tests/patmat/t4408.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2: Pattern Match Exhaustivity: List(_, _, _, _: _*)
1+
2: Pattern Match Exhaustivity: List(_, _, _, _*)

tests/patmat/t5440.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2: Pattern Match Exhaustivity: (List(_, _: _*), Nil), (Nil, List(_, _: _*))
1+
2: Pattern Match Exhaustivity: (List(_, _*), Nil), (Nil, List(_, _*))

tests/patmat/t7020.check

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
3: Pattern Match Exhaustivity: List(_, _: _*)
2-
10: Pattern Match Exhaustivity: List(_, _: _*)
3-
17: Pattern Match Exhaustivity: List(_, _: _*)
4-
24: Pattern Match Exhaustivity: List(_, _: _*)
1+
3: Pattern Match Exhaustivity: List(_, _*)
2+
10: Pattern Match Exhaustivity: List(_, _*)
3+
17: Pattern Match Exhaustivity: List(_, _*)
4+
24: Pattern Match Exhaustivity: List(_, _*)

tests/patmat/virtpatmat_apply.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2: Pattern Match Exhaustivity: List(_, _: _*)
1+
2: Pattern Match Exhaustivity: List(_, _*)

0 commit comments

Comments
 (0)