diff --git a/tests/run/tuples1.scala b/tests/run/tuples1.scala index e3978e51ac15..df6fe0377a85 100644 --- a/tests/run/tuples1.scala +++ b/tests/run/tuples1.scala @@ -25,8 +25,8 @@ object Test extends App { val a6_4 = x6(4); val a6_4c: String = a6_4; println(s"a6_4 = $a6_4") val a8_0 = x8(0); val a8_0c: String = a8_0; println(s"a8_0 = $a8_0") val c0_0 = x0 ++ x0; val c0_0c: Unit = c0_0; println(s"c0_0 = $c0_0") - val c0_1 = x0 ++ x1; val c0_1c: Int *: Unit = c0_1c; println(s"c0_1 = $c0_1") - val c1_0 = x1 ++ x0; val c1_0c: Int *: Unit = c1_0c; println(s"c1_0 = $c1_0") + val c0_1 = x0 ++ x1; val c0_1c: Int *: Unit = c0_1; println(s"c0_1 = $c0_1") + val c1_0 = x1 ++ x0; val c1_0c: Int *: Unit = c1_0; println(s"c1_0 = $c1_0") val c0_4 = x0 ++ x4; val c0_4c: (String, Int, String, Int) = c0_4; println(s"c0_4 = $c0_4") val c4_0 = x4 ++ x0; val c4_0c: (String, Int, String, Int) = c4_0; println(s"c4_0 = $c4_0") val c1_1 = x1 ++ x1; val c1_1c: (Int, Int) = c1_1; println(s"c1_1 = $c1_1") diff --git a/tests/run/typeclass-derivation2a.scala b/tests/run/typeclass-derivation2a.scala index 912f8342dfb6..67431689c2a8 100644 --- a/tests/run/typeclass-derivation2a.scala +++ b/tests/run/typeclass-derivation2a.scala @@ -25,12 +25,12 @@ object TypeLevel { def mirror(ordinal: Int): Mirror = mirror(ordinal, EmptyProduct) - val label: Array[Array[String]] = - initLabels(0, 0, new mutable.ArrayBuffer[String], new mutable.ArrayBuffer[Array[String]]) - private final val elemSeparator = '\000' private final val caseSeparator = '\001' + val label: Array[Array[String]] = + initLabels(0, 0, new mutable.ArrayBuffer[String], new mutable.ArrayBuffer[Array[String]]) + private def initLabels(start: Int, cur: Int, elems: mutable.ArrayBuffer[String], cases: mutable.ArrayBuffer[Array[String]]): Array[Array[String]] = {