Update tests after tuple changes

- dotc/scala-collections.blacklist:

Blacklist Unit and TupleN from scala-collections test

- tests/neg/i1653.scala:

Having an additional superclass on Unit seams to affect the error here (not sure why).

- tests/pos/t0301.scala:

Since `_2` is now added thought implicit conversion, the pattern used in this case is no longer stable.

- tests/pos/tcpoly_bounds1.scala:

This test uses the fact that `(A, B) <: Product2[A, B]`, which is no longer the case.

- tests/repl/patdef.check:

Having the `_i` via implicit conversions remove the @unchecked here

- tests/run/tuple-match.scala:

Replace Tuple1 in pattern matching with explicit TupleCons pattern. TupleN can still be used in apply position (defined as defs in DottyPredef), but not in unapply position.

- tests/run/unapply.scala:

Also uses the fact that `(A, B) <: Product2[A, B]`.

- tests/run/withIndex.scala:

Might be a limitation in typer?:

14 |        case _: Array[Tuple2[_, _]] => true
   |                      ^^^^^^^^^^^^
   |unreducible application of higher-kinded type [A, B] => dotty.TupleCons[A, dotty.TupleCons[B, Unit]] to wildcard arguments

Author: OlivierBlanvillain

compiler/test/dotc/scala-collections.blacklist

@@ -83,3 +83,27 @@ scala/util/control/Exception.scala
 #    |                                                                     cyclic reference involving method mkCatcher
 
 scala/concurrent/duration/Duration.scala
+
+scala/Unit.scala
+scala/Tuple1.scala
+scala/Tuple2.scala
+scala/Tuple3.scala
+scala/Tuple4.scala
+scala/Tuple5.scala
+scala/Tuple6.scala
+scala/Tuple7.scala
+scala/Tuple8.scala
+scala/Tuple9.scala
+scala/Tuple10.scala
+scala/Tuple11.scala
+scala/Tuple12.scala
+scala/Tuple13.scala
+scala/Tuple14.scala
+scala/Tuple15.scala
+scala/Tuple16.scala
+scala/Tuple17.scala
+scala/Tuple18.scala
+scala/Tuple19.scala
+scala/Tuple20.scala
+scala/Tuple21.scala
+scala/Tuple22.scala

compiler/test/dotty/tools/dotc/CompilationTests.scala

@@ -196,16 +196,12 @@ class CompilationTests extends ParallelTesting {
     val opt = Array(
       "-classpath",
       // compile with bootstrapped library on cp:
-      defaultOutputDir + "lib/src/:" +
+      Jars.dottyLib + ":" +
       // as well as bootstrapped compiler:
       defaultOutputDir + "dotty1/dotty1/:" +
       Jars.dottyInterfaces
     )
 
-    def lib =
-      compileDir("../library/src",
-        allowDeepSubtypes.and("-Ycheck-reentrant", "-strict", "-priorityclasspath", defaultOutputDir))
-
     def sources(paths: JStream[Path], excludedFiles: List[String] = Nil): List[String] =
       paths.iterator().asScala
         .filter(path =>
@@ -241,7 +237,7 @@ class CompilationTests extends ParallelTesting {
       compileShallowFilesInDir("../compiler/src/dotty", opt)
 
     {
-      lib.keepOutput :: dotty1.keepOutput :: {
+      dotty1.keepOutput :: {
         dotty2 +
         compileShallowFilesInDir("../compiler/src/dotty/tools", opt) +
         compileShallowFilesInDir("../compiler/src/dotty/tools/dotc", opt) +

library/test/dotty/ShowTests.scala

@@ -56,7 +56,7 @@ class ShowTests {
   }
 
   @Test def showMaps = {
-    val mp = scala.collection.immutable.Map("str1" -> "val1", "str2" -> "val2")
+    val mp = scala.collection.immutable.Map(scala.Tuple2("str1", "val1"), scala.Tuple2("str2", "val2"))
     assertEquals("Map(\"str1\" -> \"val1\", \"str2\" -> \"val2\")", mp.show)
   }
 

tests/neg/i1653.scala

@@ -1,3 +1,3 @@
 trait Foo {
-  def foo() = new Unit with Foo  // error: cannot extend final class Unit  // error: illegal trait inheritance
+  def foo() = new Unit with Foo  // error: cannot extend final class Unit
 }

tests/pos/t0301.scala

@@ -6,7 +6,7 @@ case class Var() extends Expr
 object Analyzer {
   def substitution(expr: Expr, cls: (Var,Var)): Expr =
     expr match {
-      case cls._2 => cls._1  // source of the error
+      case e if e == cls._2 => cls._1  // source of the error
       case _ => expr
     }
 }

tests/pos/tcpoly_bounds1.scala

@@ -1,7 +1,8 @@
-class Foo[t[x]<: Tuple2[Int, x]]
+case class OldTuple2[+T1, +T2](_1: T1, _2: T2) extends Product2[T1, T2]
 
-//
-class MyPair[z](a: Int, b: z) extends Tuple2[Int, z](a,b)
+class Foo[t[x]<: OldTuple2[Int, x]]
+
+class MyPair[z](a: Int, b: z) extends OldTuple2[Int, z](a,b)
 
 object foo extends Foo[MyPair]
 

tests/repl/patdef.check

@@ -5,6 +5,6 @@ scala> val (Const, List(`x`, _, a), b) = (0, List(0, 1337, 1), 2)
 val a: Int = 1
 val b: Int = 2
 scala> val a@b = 0
-val a: Int @unchecked = 0
-val b: Int @unchecked = 0
+val a: Int = 0
+val b: Int = 0
 scala> :quit

tests/run/tuple-match.scala

@@ -7,7 +7,7 @@ object Test {
     case (_, _, 3, _) => "4, #3"
     case (_, 2, _, _) => "4, #2"
     case (_, 2, _)    => "3, #2"
-    case Tuple1(1)    => "1, #1"
+    case dotty.TupleCons(1, ()) => "1, #1"
     case (_, _, _, 4) => "4, #4"
     case THREE        => "THREE"
     case (_, 2)       => "2, #2"

tests/run/unapply.scala

@@ -32,7 +32,7 @@ object VarFoo {
 }
 
 object Foo {
-  def unapply(x: Any): Option[Product2[Int, String]] = x match {
+  def unapply(x: Any): Option[(Int, String)] = x match {
     case y: Bar => Some(y.size, y.name)
     case _ => None
   }
@@ -68,7 +68,7 @@ object Foo {
 // same, but now object is not top-level
 object Mas {
   object Gaz {
-    def unapply(x: Any): Option[Product2[Int, String]] = x match {
+    def unapply(x: Any): Option[(Int, String)] = x match {
       case y: Baz => Some(y.size, y.name)
       case _ => None
     }

tests/run/withIndex.scala

@@ -11,7 +11,7 @@ object Test {
     Console.println(str.zipWithIndex.toList)
     assert {
       ary.zipWithIndex match {
-        case _: Array[Tuple2[_,_]] => true
+        case _: Array[(_, _)] => true
         case _ => false
       }
     }