From 9fe17af7a9d125004d249a11770ac0f62053e694 Mon Sep 17 00:00:00 2001
From: Liu Fengyun <liu@fengy.me>
Date: Mon, 22 Feb 2021 21:43:51 +0100
Subject: [PATCH] Fix #11502: use latest varargs pattern syntax

---
 .../src/dotty/tools/dotc/transform/patmat/Space.scala     | 4 ++--
 tests/patmat/exhausting.check                             | 4 ++--
 tests/patmat/i2363.check                                  | 4 ++--
 tests/patmat/t10019.check                                 | 2 +-
 tests/patmat/t4408.check                                  | 2 +-
 tests/patmat/t5440.check                                  | 2 +-
 tests/patmat/t7020.check                                  | 8 ++++----
 tests/patmat/virtpatmat_apply.check                       | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
index a884f81e53f0..c791290584e7 100644
--- a/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
+++ b/compiler/src/dotty/tools/dotc/transform/patmat/Space.scala
@@ -762,9 +762,9 @@ class SpaceEngine(using Context) extends SpaceLogic {
         if (ctx.definitions.isTupleType(tp))
           params(tp).map(_ => "_").mkString("(", ", ", ")")
         else if (scalaListType.isRef(sym))
-          if (flattenList) "_: _*" else "_: List"
+          if (flattenList) "_*" else "_: List"
         else if (scalaConsType.isRef(sym))
-          if (flattenList) "_, _: _*"  else "List(_, _: _*)"
+          if (flattenList) "_, _*"  else "List(_, _*)"
         else if (tp.classSymbol.is(Sealed) && tp.classSymbol.hasAnonymousChild)
           "_: " + showType(tp) + " (anonymous)"
         else if (tp.classSymbol.is(CaseClass) && !hasCustomUnapply(tp.classSymbol))
diff --git a/tests/patmat/exhausting.check b/tests/patmat/exhausting.check
index ad7dff8cb964..ff3536046ce5 100644
--- a/tests/patmat/exhausting.check
+++ b/tests/patmat/exhausting.check
@@ -1,6 +1,6 @@
-21: Pattern Match Exhaustivity: List(_, _, _, _: _*), List(_)
+21: Pattern Match Exhaustivity: List(_, _, _, _*), List(_)
 27: Pattern Match Exhaustivity: Nil
-32: Pattern Match Exhaustivity: List(_, _: _*)
+32: Pattern Match Exhaustivity: List(_, _*)
 39: Pattern Match Exhaustivity: Bar3
 44: Pattern Match Exhaustivity: (Bar2, Bar2)
 50: Pattern Match Exhaustivity: (Bar2, Bar2)
diff --git a/tests/patmat/i2363.check b/tests/patmat/i2363.check
index 5a6fdcbd378a..591be5c9e096 100644
--- a/tests/patmat/i2363.check
+++ b/tests/patmat/i2363.check
@@ -1,2 +1,2 @@
-15: Pattern Match Exhaustivity: List(_, _: _*)
-21: Pattern Match Exhaustivity: _: Expr
\ No newline at end of file
+15: Pattern Match Exhaustivity: List(_, _*)
+21: Pattern Match Exhaustivity: _: Expr
diff --git a/tests/patmat/t10019.check b/tests/patmat/t10019.check
index d656676f429d..6648193ae4e8 100644
--- a/tests/patmat/t10019.check
+++ b/tests/patmat/t10019.check
@@ -1,2 +1,2 @@
-2: Pattern Match Exhaustivity: (List(_, _, _: _*), List(_, _: _*)), (Nil, List(_, _: _*)), (List(_, _: _*), List(_, _, _: _*)), (List(_, _: _*), Nil)
+2: Pattern Match Exhaustivity: (List(_, _, _*), List(_, _*)), (Nil, List(_, _*)), (List(_, _*), List(_, _, _*)), (List(_, _*), Nil)
 11: Pattern Match Exhaustivity: (Foo(None), Foo(_))
diff --git a/tests/patmat/t4408.check b/tests/patmat/t4408.check
index 3936743b977c..c8f296e85367 100644
--- a/tests/patmat/t4408.check
+++ b/tests/patmat/t4408.check
@@ -1 +1 @@
-2: Pattern Match Exhaustivity: List(_, _, _, _: _*)
+2: Pattern Match Exhaustivity: List(_, _, _, _*)
diff --git a/tests/patmat/t5440.check b/tests/patmat/t5440.check
index c99016b7fe68..8ccc367704ff 100644
--- a/tests/patmat/t5440.check
+++ b/tests/patmat/t5440.check
@@ -1 +1 @@
-2: Pattern Match Exhaustivity: (List(_, _: _*), Nil), (Nil, List(_, _: _*))
+2: Pattern Match Exhaustivity: (List(_, _*), Nil), (Nil, List(_, _*))
diff --git a/tests/patmat/t7020.check b/tests/patmat/t7020.check
index 4a9c8c9baaaf..410b921957fe 100644
--- a/tests/patmat/t7020.check
+++ b/tests/patmat/t7020.check
@@ -1,4 +1,4 @@
-3: Pattern Match Exhaustivity: List(_, _: _*)
-10: Pattern Match Exhaustivity: List(_, _: _*)
-17: Pattern Match Exhaustivity: List(_, _: _*)
-24: Pattern Match Exhaustivity: List(_, _: _*)
+3: Pattern Match Exhaustivity: List(_, _*)
+10: Pattern Match Exhaustivity: List(_, _*)
+17: Pattern Match Exhaustivity: List(_, _*)
+24: Pattern Match Exhaustivity: List(_, _*)
diff --git a/tests/patmat/virtpatmat_apply.check b/tests/patmat/virtpatmat_apply.check
index f84573ccee9c..f899fed86304 100644
--- a/tests/patmat/virtpatmat_apply.check
+++ b/tests/patmat/virtpatmat_apply.check
@@ -1 +1 @@
-2: Pattern Match Exhaustivity: List(_, _: _*)
+2: Pattern Match Exhaustivity: List(_, _*)