Skip to content

Commit c1612fa

Browse files
authored
Merge pull request #8109 from dotty-staging/fix-init
Fix init error in test
2 parents e8749af + 1522edd commit c1612fa

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

tests/run/tuples1.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ object Test extends App {
2525
val a6_4 = x6(4); val a6_4c: String = a6_4; println(s"a6_4 = $a6_4")
2626
val a8_0 = x8(0); val a8_0c: String = a8_0; println(s"a8_0 = $a8_0")
2727
val c0_0 = x0 ++ x0; val c0_0c: Unit = c0_0; println(s"c0_0 = $c0_0")
28-
val c0_1 = x0 ++ x1; val c0_1c: Int *: Unit = c0_1c; println(s"c0_1 = $c0_1")
29-
val c1_0 = x1 ++ x0; val c1_0c: Int *: Unit = c1_0c; println(s"c1_0 = $c1_0")
28+
val c0_1 = x0 ++ x1; val c0_1c: Int *: Unit = c0_1; println(s"c0_1 = $c0_1")
29+
val c1_0 = x1 ++ x0; val c1_0c: Int *: Unit = c1_0; println(s"c1_0 = $c1_0")
3030
val c0_4 = x0 ++ x4; val c0_4c: (String, Int, String, Int) = c0_4; println(s"c0_4 = $c0_4")
3131
val c4_0 = x4 ++ x0; val c4_0c: (String, Int, String, Int) = c4_0; println(s"c4_0 = $c4_0")
3232
val c1_1 = x1 ++ x1; val c1_1c: (Int, Int) = c1_1; println(s"c1_1 = $c1_1")

tests/run/typeclass-derivation2a.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ object TypeLevel {
2525
def mirror(ordinal: Int): Mirror =
2626
mirror(ordinal, EmptyProduct)
2727

28-
val label: Array[Array[String]] =
29-
initLabels(0, 0, new mutable.ArrayBuffer[String], new mutable.ArrayBuffer[Array[String]])
30-
3128
private final val elemSeparator = '\000'
3229
private final val caseSeparator = '\001'
3330

31+
val label: Array[Array[String]] =
32+
initLabels(0, 0, new mutable.ArrayBuffer[String], new mutable.ArrayBuffer[Array[String]])
33+
3434
private def initLabels(start: Int, cur: Int,
3535
elems: mutable.ArrayBuffer[String],
3636
cases: mutable.ArrayBuffer[Array[String]]): Array[Array[String]] = {

0 commit comments

Comments
 (0)