Skip to content

Commit eb8a9ab

Browse files
oderskyodersky
committed
Fix patmat exhaustivity check files
Children now appear in the order of their definition, where before there was no guaranteed order and the actual order was more likely the reverse of definition order.
1 parent c7a09f2 commit eb8a9ab

25 files changed

+33
-33
lines changed

‎tests/patmat/3333.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10: Pattern Match Exhaustivity: _: IntNumber, NotNaN
1+
10: Pattern Match Exhaustivity: NotNaN, _: IntNumber

‎tests/patmat/aliasing.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
14: Pattern Match Exhaustivity: _: Clazz & Test.Alias1, _: Trait & Test.Alias1
1+
14: Pattern Match Exhaustivity: _: Trait & Test.Alias1, _: Clazz & Test.Alias1
22
19: Pattern Match Exhaustivity: _: Trait & Test.Alias2
33
23: Pattern Match Exhaustivity: _: Trait & (Test.Alias2 & OpenTrait2){x: Int}

‎tests/patmat/andtype-opentype-interaction.check

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
23: Pattern Match Exhaustivity: _: SealedAbstractClass & OpenTrait, _: SealedClass & OpenTrait, _: SealedTrait & OpenTrait, _: AbstractClass & OpenTrait, _: Clazz & OpenTrait, _: Trait & OpenTrait
2-
27: Pattern Match Exhaustivity: _: SealedAbstractClass & OpenTrait & OpenTrait2, _: SealedClass & OpenTrait & OpenTrait2, _: SealedTrait & OpenTrait & OpenTrait2, _: AbstractClass & OpenTrait & OpenTrait2, _: Clazz & OpenTrait & OpenTrait2, _: Trait & OpenTrait & OpenTrait2
3-
31: Pattern Match Exhaustivity: _: SealedTrait & OpenClass, _: Trait & OpenClass
4-
35: Pattern Match Exhaustivity: _: SealedTrait & OpenTrait & OpenClass, _: Trait & OpenTrait & OpenClass
5-
43: Pattern Match Exhaustivity: _: SealedTrait & OpenAbstractClass, _: Trait & OpenAbstractClass
6-
47: Pattern Match Exhaustivity: _: SealedTrait & OpenClass & (OpenTrait & OpenClassSubclass), _: Trait & OpenClass & (OpenTrait & OpenClassSubclass)
1+
23: Pattern Match Exhaustivity: _: Trait & OpenTrait, _: Clazz & OpenTrait, _: AbstractClass & OpenTrait, _: SealedTrait & OpenTrait, _: SealedClass & OpenTrait, _: SealedAbstractClass & OpenTrait
2+
27: Pattern Match Exhaustivity: _: Trait & OpenTrait & OpenTrait2, _: Clazz & OpenTrait & OpenTrait2, _: AbstractClass & OpenTrait & OpenTrait2, _: SealedTrait & OpenTrait & OpenTrait2, _: SealedClass & OpenTrait & OpenTrait2, _: SealedAbstractClass & OpenTrait & OpenTrait2
3+
31: Pattern Match Exhaustivity: _: Trait & OpenClass, _: SealedTrait & OpenClass
4+
35: Pattern Match Exhaustivity: _: Trait & OpenTrait & OpenClass, _: SealedTrait & OpenTrait & OpenClass
5+
43: Pattern Match Exhaustivity: _: Trait & OpenAbstractClass, _: SealedTrait & OpenAbstractClass
6+
47: Pattern Match Exhaustivity: _: Trait & OpenClass & (OpenTrait & OpenClassSubclass), _: SealedTrait & OpenClass & (OpenTrait & OpenClassSubclass)

‎tests/patmat/andtype-refinedtype-interaction.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
32: Pattern Match Exhaustivity: _: Trait & C1{x: Int}
2-
48: Pattern Match Exhaustivity: _: Clazz & (C1 | (C2 | T1)){x: Int} & (C3 | (C4 | T2)){x: Int}, _: Trait & (C1 | (C2 | T1)){x: Int} & (C3 | (C4 | T2)){x: Int}
2+
48: Pattern Match Exhaustivity: _: Trait & (C1 | (C2 | T1)){x: Int} & (C3 | (C4 | T2)){x: Int}, _: Clazz & (C1 | (C2 | T1)){x: Int} & (C3 | (C4 | T2)){x: Int}
33
54: Pattern Match Exhaustivity: _: Trait & (C1 | (C2 | T1)){x: Int} & C3{x: Int}
44
65: Pattern Match Exhaustivity: _: Trait & (C1 | C2){x: Int} & (C3 | SubC1){x: Int}
55
72: Pattern Match Exhaustivity: _: Trait & (T1 & (C1 | SubC2)){x: Int} & (T2 & (C2 | C3 | SubC1)){x: Int} &

‎tests/patmat/enum/expected.check

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
4: Pattern Match Exhaustivity: SATURDAY, FRIDAY, THURSDAY, SUNDAY
2-
15: Pattern Match Exhaustivity: SATURDAY, FRIDAY, THURSDAY
1+
4: Pattern Match Exhaustivity: SUNDAY, THURSDAY, FRIDAY, SATURDAY
2+
15: Pattern Match Exhaustivity: THURSDAY, FRIDAY, SATURDAY

‎tests/patmat/exhausting.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
21: Pattern Match Exhaustivity: List(_), List(_, _, _, _: _*)
1+
21: Pattern Match Exhaustivity: List(_, _, _, _: _*), List(_)
22
27: Pattern Match Exhaustivity: Nil
33
32: Pattern Match Exhaustivity: List(_, _: _*)
44
39: Pattern Match Exhaustivity: Bar3

‎tests/patmat/gadt.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
13: Pattern Match Exhaustivity: IntLit(_)
22
22: Pattern Match Exhaustivity: Or(_, _)
3-
45: Pattern Match Exhaustivity: BooleanLit(_), IntLit(_)
3+
45: Pattern Match Exhaustivity: IntLit(_), BooleanLit(_)
44
55: Pattern Match Exhaustivity: Sum(_, _)

‎tests/patmat/i2253.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
28: Pattern Match Exhaustivity: HasIntXIntM, HasIntXStringM
1+
28: Pattern Match Exhaustivity: HasIntXStringM, HasIntXIntM
22
29: Pattern Match Exhaustivity: HasIntXIntM
33
30: Pattern Match Exhaustivity: HasIntXIntM

‎tests/patmat/i3645b.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
21: Pattern Match Exhaustivity: K3, K2
1+
21: Pattern Match Exhaustivity: K2, K3

‎tests/patmat/i3645c.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
21: Pattern Match Exhaustivity: K3, K2
1+
21: Pattern Match Exhaustivity: K2, K3

‎tests/patmat/i3645d.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
21: Pattern Match Exhaustivity: K3, K2
1+
21: Pattern Match Exhaustivity: K2, K3

‎tests/patmat/i4226b.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
11: Pattern Match Exhaustivity: _: Empty, Just(_)
1+
11: Pattern Match Exhaustivity: Just(_), _: Empty

‎tests/patmat/i4880.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10: Pattern Match Exhaustivity: _: ZipArchive, _: VirtualFile, _: PlainFile
1+
10: Pattern Match Exhaustivity: _: PlainFile, _: VirtualFile, _: ZipArchive

‎tests/patmat/nontrivial-andtype.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16: Pattern Match Exhaustivity: D, _: C, B(), _: A
1+
16: Pattern Match Exhaustivity: _: A, B(), _: C, D

‎tests/patmat/patmat-adt.check

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
7: Pattern Match Exhaustivity: Bad(Good(_)), Good(Bad(_))
1+
7: Pattern Match Exhaustivity: Good(Bad(_)), Bad(Good(_))
22
19: Pattern Match Exhaustivity: Some(_)
33
24: Pattern Match Exhaustivity: (_, Some(_))
44
29: Pattern Match Exhaustivity: (None, None), (Some(_), Some(_))
5-
50: Pattern Match Exhaustivity: LetL(BooleanLit), LetL(IntLit)
5+
50: Pattern Match Exhaustivity: LetL(IntLit), LetL(BooleanLit)

‎tests/patmat/patmat-ortype.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
8: Pattern Match Exhaustivity: _: String
2-
18: Pattern Match Exhaustivity: Some(_: String), None
2+
18: Pattern Match Exhaustivity: None, Some(_: String)
33
36: Pattern Match Exhaustivity: Some(_: String)

‎tests/patmat/patmatexhaust-huge.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
404: Pattern Match Exhaustivity: C397, C392
1+
404: Pattern Match Exhaustivity: C392, C397

‎tests/patmat/patmatexhaust.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
75: Pattern Match Exhaustivity: _: B
77
87: Pattern Match Exhaustivity: _: C1
88
100: Pattern Match Exhaustivity: _: C1
9-
114: Pattern Match Exhaustivity: D2(), D1
9+
114: Pattern Match Exhaustivity: D1, D2()
1010
126: Pattern Match Exhaustivity: _: C1

‎tests/patmat/sealed-java-enums.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5: Pattern Match Exhaustivity: TERMINATED, TIMED_WAITING, BLOCKED
1+
5: Pattern Match Exhaustivity: BLOCKED, TIMED_WAITING, TERMINATED

‎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(_, _: _*), Nil), (List(_, _: _*), List(_, _, _: _*)), (Nil, List(_, _: _*)), (List(_, _, _: _*), List(_, _: _*))
1+
2: Pattern Match Exhaustivity: (List(_, _: _*), List(_, _, _: _*)), (List(_, _: _*), Nil), (List(_, _, _: _*), List(_, _: _*)), (Nil, List(_, _: _*))
22
11: Pattern Match Exhaustivity: (Foo(None), Foo(_))

‎tests/patmat/t6420.check

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

‎tests/patmat/t7746.check

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

‎tests/patmat/t8430.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
15: Pattern Match Exhaustivity: LetF, LetC, LetP, LetL(UnitLit), LetL(BooleanLit), LetL(IntLit)
1+
15: Pattern Match Exhaustivity: LetL(IntLit), LetL(BooleanLit), LetL(UnitLit), LetP, LetC, LetF

‎tests/patmat/t8511.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18: Pattern Match Exhaustivity: EatsExhaustiveWarning(_), Baz(), Bar(_)
1+
18: Pattern Match Exhaustivity: Bar(_), Baz(), EatsExhaustiveWarning(_)

‎tests/patmat/t9232.check

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
13: Pattern Match Exhaustivity: Node2()
2-
17: Pattern Match Exhaustivity: Node2(), Node1(Foo(Nil)), Node1(Foo(List(_, _: _*)))
3-
21: Pattern Match Exhaustivity: Node2(), Node1(Foo(Nil))
2+
17: Pattern Match Exhaustivity: Node1(Foo(List(_, _: _*))), Node1(Foo(Nil)), Node2()
3+
21: Pattern Match Exhaustivity: Node1(Foo(Nil)), Node2()

0 commit comments

Comments
 (0)