Skip to content

Commit ce53f6e

Browse files
HarrisL2HarrisL2
committed
Adjust tests
1 parent 855c7c9 commit ce53f6e

File tree

7 files changed

+54
-42
lines changed

7 files changed

+54
-42
lines changed

‎tests/explicit-nulls/warn/i21577.check‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
11
-- [E121] Pattern Match Warning: tests/explicit-nulls/warn/i21577.scala:5:9 --------------------------------------------
2-
5 | case _ => // warn
2+
5 | case _ => // warn: null only
33
| ^
44
| Unreachable case except for null (if this is intentional, consider writing case null => instead).
55
-- [E121] Pattern Match Warning: tests/explicit-nulls/warn/i21577.scala:12:9 -------------------------------------------
6-
12 | case _ => // warn
6+
12 | case _ => // warn: null only
77
| ^
88
| Unreachable case except for null (if this is intentional, consider writing case null => instead).
9+
-- [E121] Pattern Match Warning: tests/explicit-nulls/warn/i21577.scala:16:7 -------------------------------------------
10+
16 | case _ => // warn: null only
11+
| ^
12+
| Unreachable case except for null (if this is intentional, consider writing case null => instead).
913
-- [E030] Match case Unreachable Warning: tests/explicit-nulls/warn/i21577.scala:20:7 ----------------------------------
10-
20 | case _ => // warn
14+
20 | case _ => // warn: unreachable
1115
| ^
1216
| Unreachable case
1317
-- [E029] Pattern Match Exhaustivity Warning: tests/explicit-nulls/warn/i21577.scala:29:27 -----------------------------
14-
29 |def f7(s: String | Null) = s match // warn
18+
29 |def f7(s: String | Null) = s match // warn: not exhuastive
1519
| ^
1620
| match may not be exhaustive.
1721
|
1822
| It would fail on pattern case: _: Null
1923
|
2024
| longer explanation available when compiling with `-explain`
2125
-- [E029] Pattern Match Exhaustivity Warning: tests/explicit-nulls/warn/i21577.scala:36:33 -----------------------------
22-
36 |def f9(s: String | Int | Null) = s match // warn
26+
36 |def f9(s: String | Int | Null) = s match // warn: not exhuastive
2327
| ^
2428
| match may not be exhaustive.
2529
|

‎tests/explicit-nulls/warn/i21577.scala‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@ def f(s: String) =
22
val s2 = s.trim()
33
s2 match
44
case s3: String =>
5-
case _ => // warn
5+
case _ => // warn: null only
66

77

88
def f2(s: String | Null) =
99
val s2 = s.nn.trim()
1010
s2 match
1111
case s3: String =>
12-
case _ => // warn
12+
case _ => // warn: null only
1313

1414
def f3(s: String | Null) = s match
1515
case s2: String =>
16-
case _ =>
16+
case _ => // warn: null only
1717

1818
def f5(s: String) = s match
1919
case _: String =>
20-
case _ => // warn
20+
case _ => // warn: unreachable
2121

2222
def f6(s: String) = s.trim() match
2323
case _: String =>
@@ -26,13 +26,13 @@ def f6(s: String) = s.trim() match
2626
def f61(s: String) = s.trim() match
2727
case _: String =>
2828

29-
def f7(s: String | Null) = s match // warn
29+
def f7(s: String | Null) = s match // warn: not exhuastive
3030
case _: String =>
3131

3232
def f8(s: String | Null) = s match
3333
case _: String =>
3434
case null =>
3535

36-
def f9(s: String | Int | Null) = s match // warn
36+
def f9(s: String | Int | Null) = s match // warn: not exhuastive
3737
case _: String =>
3838
case null =>

‎tests/warn/i20121.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ case class CC_B[A](a: A) extends T_A[A, X]
55

66
val v_a: T_A[X, X] = CC_B(null)
77
val v_b = v_a match
8-
case CC_B(_) => 0 // warn: unreachable
9-
case _ => 1
8+
case CC_B(_) => 0
9+
case _ => 1 // warn: null only
1010
// for CC_B[A] to match T_A[X, X]
1111
// A := X
1212
// so require X, aka T_A[Byte, Byte]

‎tests/warn/i20122.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ case class CC_E(a: CC_C[Char, Byte])
77

88
val v_a: T_B[Int, CC_A] = CC_B(CC_E(CC_C(null)))
99
val v_b = v_a match
10-
case CC_B(CC_E(CC_C(_))) => 0 // warn: unreachable
10+
case CC_B(CC_E(CC_C(_))) => 0
1111
case _ => 1
1212
// for CC_B[A, C] to match T_B[C, CC_A]
1313
// C <: Int, ok

‎tests/warn/i20123.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ case class CC_G[A, C](c: C) extends T_A[A, C]
88
val v_a: T_A[Boolean, T_B[Boolean]] = CC_G(null)
99
val v_b = v_a match {
1010
case CC_D() => 0
11-
case CC_G(_) => 1 // warn: unreachable
11+
case CC_G(_) => 1
1212
// for CC_G[A, C] to match T_A[Boolean, T_B[Boolean]]
1313
// A := Boolean, which is ok
1414
// C := T_B[Boolean],

‎tests/warn/redundant-null.check‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,56 @@
11
-- [E030] Match case Unreachable Warning: tests/warn/redundant-null.scala:10:7 -----------------------------------------
2-
10 | case _: n.type => // warn
2+
10 | case _: n.type => // warn: unreachable
33
| ^^^^^^^^^
44
| Unreachable case
55
-- [E030] Match case Unreachable Warning: tests/warn/redundant-null.scala:12:7 -----------------------------------------
6-
12 | case _ => // warn
6+
12 | case _ => // warn: unreachable
77
| ^
88
| Unreachable case
99
-- [E030] Match case Unreachable Warning: tests/warn/redundant-null.scala:13:7 -----------------------------------------
10-
13 | case _ => // warn
10+
13 | case _ => // warn: unreachable
1111
| ^
1212
| Unreachable case
1313
-- [E030] Match case Unreachable Warning: tests/warn/redundant-null.scala:18:7 -----------------------------------------
14-
18 | case _ => 3 // warn
14+
18 | case _ => 3 // warn: unreachable
1515
| ^
1616
| Unreachable case
1717
-- [E030] Match case Unreachable Warning: tests/warn/redundant-null.scala:23:7 -----------------------------------------
18-
23 | case _: B => // warn
18+
23 | case _: B => // warn: unreachable
1919
| ^^^^
2020
| Unreachable case
2121
-- [E030] Match case Unreachable Warning: tests/warn/redundant-null.scala:24:7 -----------------------------------------
22-
24 | case _ => // warn
22+
24 | case _ => // warn: unreachable
2323
| ^
2424
| Unreachable case
2525
-- [E030] Match case Unreachable Warning: tests/warn/redundant-null.scala:25:7 -----------------------------------------
26-
25 | case null => // warn
26+
25 | case null => // warn: unreachable
2727
| ^^^^
2828
| Unreachable case
2929
-- [E121] Pattern Match Warning: tests/warn/redundant-null.scala:30:7 --------------------------------------------------
30-
30 | case _ => // warn
30+
30 | case _ => // warn: null only
3131
| ^
3232
| Unreachable case except for null (if this is intentional, consider writing case null => instead).
3333
-- [E030] Match case Unreachable Warning: tests/warn/redundant-null.scala:31:7 -----------------------------------------
34-
31 | case null => // warn
34+
31 | case null => // warn: unreachable
3535
| ^^^^
3636
| Unreachable case
3737
-- [E030] Match case Unreachable Warning: tests/warn/redundant-null.scala:32:7 -----------------------------------------
38-
32 | case _ => // warn
38+
32 | case _ => // warn: unreachable
3939
| ^
4040
| Unreachable case
4141
-- [E030] Match case Unreachable Warning: tests/warn/redundant-null.scala:33:7 -----------------------------------------
42-
33 | case _ => // warn
42+
33 | case _ => // warn: unreachable
4343
| ^
4444
| Unreachable case
4545
-- [E030] Match case Unreachable Warning: tests/warn/redundant-null.scala:37:7 -----------------------------------------
46-
37 | case _ => println("unreachable") // warn
46+
37 | case _ => // warn: unreachable
4747
| ^
4848
| Unreachable case
4949
-- [E030] Match case Unreachable Warning: tests/warn/redundant-null.scala:41:7 -----------------------------------------
50-
41 | case _ => // warn
50+
41 | case _ => // warn: unreachable
5151
| ^
5252
| Unreachable case
53+
-- [E121] Pattern Match Warning: tests/warn/redundant-null.scala:45:7 --------------------------------------------------
54+
45 | case _ => // warn: null only
55+
| ^
56+
| Unreachable case except for null (if this is intentional, consider writing case null => instead).

‎tests/warn/redundant-null.scala‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,39 @@ val n = null
77
def f(s: A) = s match
88
case _: n.type =>
99
case _: A =>
10-
case _: n.type => // warn
10+
case _: n.type => // warn: unreachable
1111
case null =>
12-
case _ => // warn
13-
case _ => // warn
12+
case _ => // warn: unreachable
13+
case _ => // warn: unreachable
1414

1515
def f2(s: A | B | C) = s match
1616
case _: A => 0
1717
case _: C | null | _: B => 1
18-
case _ => 3 // warn
18+
case _ => 3 // warn: unreachable
1919

2020
def f3(s: A | B) = s match
2121
case _: A =>
2222
case _ =>
23-
case _: B => // warn
24-
case _ => // warn
25-
case null => // warn
23+
case _: B => // warn: unreachable
24+
case _ => // warn: unreachable
25+
case null => // warn: unreachable
2626

2727
def f4(s: String | Int) = s match
2828
case _: Int =>
2929
case _: String =>
30-
case _ => // warn
31-
case null => // warn
32-
case _ => // warn
33-
case _ => // warn
30+
case _ => // warn: null only
31+
case null => // warn: unreachable
32+
case _ => // warn: unreachable
33+
case _ => // warn: unreachable
3434

3535
def f5(x: String) = x match
36-
case x => println("catch all")
37-
case _ => println("unreachable") // warn
36+
case x =>
37+
case _ => // warn: unreachable
3838

3939
def test(s: String | Null) = s match
4040
case ss =>
41-
case _ => // warn
41+
case _ => // warn: unreachable
42+
43+
def test2(s: String | Null) = s match
44+
case ss: String =>
45+
case _ => // warn: null only

0 commit comments

Comments
 (0)