Skip to content

Commit 44f164f

Browse files
bishaboshabishabosha
committed
remove 3.2-migration
revert this commit if we actually need a 3.2 migration, i.e. because we enable strict pattern matching
1 parent b5a98e7 commit 44f164f

File tree

2 files changed

+41
-27
lines changed

2 files changed

+41
-27
lines changed

‎compiler/src/dotty/tools/dotc/config/SourceVersion.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ import dotty.tools.dotc.core.Names.Name
2020
*/
2121
enum SourceVersion:
2222
case `3.0-migration`, `3.0`, `3.1` // Note: do not add `3.1-migration` here, 3.1 is the same language as 3.0.
23-
case `3.2`, `3.2-migration` // !!! DELETE `3.2-migration` BEFORE RELEASING 3.2.0 if we do not enable features from `future`
23+
// case `3.2-migration` // !!! UNCOMMENT `3.2-migration` BEFORE RELEASING 3.2.0 if we enable features from `future`
24+
case `3.2`
2425
case `future-migration`, `future`
2526

2627
val isMigrating: Boolean = toString.endsWith("-migration")

‎compiler/test/dotty/tools/dotc/config/SourceVersionTest.scala

+39-26
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ class SourceVersionTest:
1717
assertEquals(SourceVersion.`3.1`, importLanguageDot("3.1-migration"))
1818

1919
assertEquals(SourceVersion.`3.1`, importLanguageDot("3.1"))
20-
assertEquals(SourceVersion.`3.2-migration`, importLanguageDot("3.2-migration"))
20+
// assertEquals(SourceVersion.`3.2-migration`, importLanguageDot("3.2-migration")) // uncomment when we introduce `3.2-migration`
21+
assertEquals(SourceVersion.`3.2`, importLanguageDot("3.2-migration")) // delete when we introduce `3.2-migration`
2122
assertEquals(SourceVersion.`3.2`, importLanguageDot("3.2"))
2223
assertEquals(SourceVersion.`future-migration`, importLanguageDot("future-migration"))
2324
assertEquals(SourceVersion.`future`, importLanguageDot("future"))
@@ -26,67 +27,79 @@ class SourceVersionTest:
2627
assertEquals(SourceVersion.`3.0`, SourceVersion.`3.0-migration`.series)
2728
assertEquals(SourceVersion.`3.0`, SourceVersion.`3.0`.series)
2829
assertEquals(SourceVersion.`3.0`, SourceVersion.`3.1`.series)
29-
assertEquals(SourceVersion.`3.2`, SourceVersion.`3.2-migration`.series)
30-
assertEquals(SourceVersion.`3.2`, SourceVersion.`3.2`.series)
30+
// assertEquals(SourceVersion.`3.2`, SourceVersion.`3.2-migration`.series) // uncomment when we introduce `3.2-migration`
31+
// assertEquals(SourceVersion.`3.2`, SourceVersion.`3.2`.series) // uncomment when we introduce `3.2-migration`
32+
assertEquals(SourceVersion.`3.0`, SourceVersion.`3.2`.series) // delete when we introduce `3.2-migration`
3133
assertEquals(SourceVersion.`future`, SourceVersion.`future-migration`.series)
3234
assertEquals(SourceVersion.`future`, SourceVersion.`future`.series)
3335

3436
@Test def `isAtLeast 3.0`: Unit =
3537
// trues
38+
assertTrue(SourceVersion.`3.2`.isAtLeast(SourceVersion.`3.2`)) // delete when we introduce `3.2-migration`
39+
assertTrue(SourceVersion.`3.2`.isAtLeast(SourceVersion.`3.1`)) // delete when we introduce `3.2-migration`
40+
assertTrue(SourceVersion.`3.2`.isAtLeast(SourceVersion.`3.0`)) // delete when we introduce `3.2-migration`
41+
assertTrue(SourceVersion.`3.2`.isAtLeast(SourceVersion.`3.0-migration`)) // delete when we introduce `3.2-migration`
42+
assertTrue(SourceVersion.`3.1`.isAtLeast(SourceVersion.`3.2`)) // delete when we introduce `3.2-migration`
3643
assertTrue(SourceVersion.`3.1`.isAtLeast(SourceVersion.`3.1`))
3744
assertTrue(SourceVersion.`3.1`.isAtLeast(SourceVersion.`3.0`))
3845
assertTrue(SourceVersion.`3.1`.isAtLeast(SourceVersion.`3.0-migration`))
46+
assertTrue(SourceVersion.`3.0`.isAtLeast(SourceVersion.`3.2`)) // delete when we introduce `3.2-migration`
3947
assertTrue(SourceVersion.`3.0`.isAtLeast(SourceVersion.`3.1`))
4048
assertTrue(SourceVersion.`3.0`.isAtLeast(SourceVersion.`3.0`))
4149
assertTrue(SourceVersion.`3.0`.isAtLeast(SourceVersion.`3.0-migration`))
50+
assertTrue(SourceVersion.`3.0-migration`.isAtLeast(SourceVersion.`3.2`)) // delete when we introduce `3.2-migration`
4251
assertTrue(SourceVersion.`3.0-migration`.isAtLeast(SourceVersion.`3.1`))
4352
assertTrue(SourceVersion.`3.0-migration`.isAtLeast(SourceVersion.`3.0`))
4453
assertTrue(SourceVersion.`3.0-migration`.isAtLeast(SourceVersion.`3.0-migration`))
54+
55+
4556
// falses
4657
assertFalse(SourceVersion.`3.0-migration`.isAtLeast(SourceVersion.`future`))
4758
assertFalse(SourceVersion.`3.0-migration`.isAtLeast(SourceVersion.`future-migration`))
48-
assertFalse(SourceVersion.`3.0-migration`.isAtLeast(SourceVersion.`3.2`))
49-
assertFalse(SourceVersion.`3.0-migration`.isAtLeast(SourceVersion.`3.2-migration`))
59+
// assertFalse(SourceVersion.`3.0-migration`.isAtLeast(SourceVersion.`3.2`)) // uncomment when we introduce `3.2-migration`
60+
// assertFalse(SourceVersion.`3.0-migration`.isAtLeast(SourceVersion.`3.2-migration`)) // uncomment when we introduce `3.2-migration`
5061
assertFalse(SourceVersion.`3.0`.isAtLeast(SourceVersion.`future`))
5162
assertFalse(SourceVersion.`3.0`.isAtLeast(SourceVersion.`future-migration`))
52-
assertFalse(SourceVersion.`3.0`.isAtLeast(SourceVersion.`3.2`))
53-
assertFalse(SourceVersion.`3.0`.isAtLeast(SourceVersion.`3.2-migration`))
63+
// assertFalse(SourceVersion.`3.0`.isAtLeast(SourceVersion.`3.2`)) // uncomment when we introduce `3.2-migration`
64+
// assertFalse(SourceVersion.`3.0`.isAtLeast(SourceVersion.`3.2-migration`)) // uncomment when we introduce `3.2-migration`
5465
assertFalse(SourceVersion.`3.1`.isAtLeast(SourceVersion.`future`))
5566
assertFalse(SourceVersion.`3.1`.isAtLeast(SourceVersion.`future-migration`))
56-
assertFalse(SourceVersion.`3.1`.isAtLeast(SourceVersion.`3.2`))
57-
assertFalse(SourceVersion.`3.1`.isAtLeast(SourceVersion.`3.2-migration`))
67+
// assertFalse(SourceVersion.`3.1`.isAtLeast(SourceVersion.`3.2`)) // uncomment when we introduce `3.2-migration`
68+
// assertFalse(SourceVersion.`3.1`.isAtLeast(SourceVersion.`3.2-migration`)) // uncomment when we introduce `3.2-migration
69+
assertFalse(SourceVersion.`3.2`.isAtLeast(SourceVersion.`future`)) // delete when we introduce `3.2-migration`
70+
assertFalse(SourceVersion.`3.2`.isAtLeast(SourceVersion.`future-migration`)) // delete when we introduce `3.2-migration`
5871

59-
@Test def `isAtLeast 3.2`: Unit =
72+
// @Test def `isAtLeast 3.2`: Unit = // uncomment when we introduce `3.2-migration`
6073
// trues
61-
assertTrue(SourceVersion.`3.2`.isAtLeast(SourceVersion.`3.2`))
62-
assertTrue(SourceVersion.`3.2`.isAtLeast(SourceVersion.`3.2-migration`))
63-
assertTrue(SourceVersion.`3.2`.isAtLeast(SourceVersion.`3.1`))
64-
assertTrue(SourceVersion.`3.2`.isAtLeast(SourceVersion.`3.0`))
65-
assertTrue(SourceVersion.`3.2`.isAtLeast(SourceVersion.`3.0-migration`))
66-
assertTrue(SourceVersion.`3.2-migration`.isAtLeast(SourceVersion.`3.2`))
67-
assertTrue(SourceVersion.`3.2-migration`.isAtLeast(SourceVersion.`3.2-migration`))
68-
assertTrue(SourceVersion.`3.2-migration`.isAtLeast(SourceVersion.`3.1`))
69-
assertTrue(SourceVersion.`3.2-migration`.isAtLeast(SourceVersion.`3.0`))
70-
assertTrue(SourceVersion.`3.2-migration`.isAtLeast(SourceVersion.`3.0-migration`))
74+
// assertTrue(SourceVersion.`3.2`.isAtLeast(SourceVersion.`3.2`)) // uncomment when we introduce `3.2-migration`
75+
// assertTrue(SourceVersion.`3.2`.isAtLeast(SourceVersion.`3.2-migration`)) // uncomment when we introduce `3.2-migration`
76+
// assertTrue(SourceVersion.`3.2`.isAtLeast(SourceVersion.`3.1`)) // uncomment when we introduce `3.2-migration`
77+
// assertTrue(SourceVersion.`3.2`.isAtLeast(SourceVersion.`3.0`)) // uncomment when we introduce `3.2-migration`
78+
// assertTrue(SourceVersion.`3.2`.isAtLeast(SourceVersion.`3.0-migration`)) // uncomment when we introduce `3.2-migration`
79+
// assertTrue(SourceVersion.`3.2-migration`.isAtLeast(SourceVersion.`3.2`)) // uncomment when we introduce `3.2-migration`
80+
// assertTrue(SourceVersion.`3.2-migration`.isAtLeast(SourceVersion.`3.2-migration`)) // uncomment when we introduce `3.2-migration`
81+
// assertTrue(SourceVersion.`3.2-migration`.isAtLeast(SourceVersion.`3.1`)) // uncomment when we introduce `3.2-migration`
82+
// assertTrue(SourceVersion.`3.2-migration`.isAtLeast(SourceVersion.`3.0`)) // uncomment when we introduce `3.2-migration`
83+
// assertTrue(SourceVersion.`3.2-migration`.isAtLeast(SourceVersion.`3.0-migration`)) // uncomment when we introduce `3.2-migration`
7184
// falses
72-
assertFalse(SourceVersion.`3.2-migration`.isAtLeast(SourceVersion.`future`))
73-
assertFalse(SourceVersion.`3.2-migration`.isAtLeast(SourceVersion.`future-migration`))
74-
assertFalse(SourceVersion.`3.2`.isAtLeast(SourceVersion.`future`))
75-
assertFalse(SourceVersion.`3.2`.isAtLeast(SourceVersion.`future-migration`))
85+
// assertFalse(SourceVersion.`3.2-migration`.isAtLeast(SourceVersion.`future`)) // uncomment when we introduce `3.2-migration`
86+
// assertFalse(SourceVersion.`3.2-migration`.isAtLeast(SourceVersion.`future-migration`)) // uncomment when we introduce `3.2-migration`
87+
// assertFalse(SourceVersion.`3.2`.isAtLeast(SourceVersion.`future`)) // uncomment when we introduce `3.2-migration`
88+
// assertFalse(SourceVersion.`3.2`.isAtLeast(SourceVersion.`future-migration`)) // uncomment when we introduce `3.2-migration`
7689

7790
@Test def `isAtLeast future`: Unit =
7891
// trues
7992
assertTrue(SourceVersion.`future`.isAtLeast(SourceVersion.`future`))
8093
assertTrue(SourceVersion.`future`.isAtLeast(SourceVersion.`future-migration`))
8194
assertTrue(SourceVersion.`future`.isAtLeast(SourceVersion.`3.2`))
82-
assertTrue(SourceVersion.`future`.isAtLeast(SourceVersion.`3.2-migration`))
95+
// assertTrue(SourceVersion.`future`.isAtLeast(SourceVersion.`3.2-migration`))
8396
assertTrue(SourceVersion.`future`.isAtLeast(SourceVersion.`3.1`))
8497
assertTrue(SourceVersion.`future`.isAtLeast(SourceVersion.`3.0`))
8598
assertTrue(SourceVersion.`future`.isAtLeast(SourceVersion.`3.0-migration`))
8699
assertTrue(SourceVersion.`future-migration`.isAtLeast(SourceVersion.`future`))
87100
assertTrue(SourceVersion.`future-migration`.isAtLeast(SourceVersion.`future-migration`))
88101
assertTrue(SourceVersion.`future-migration`.isAtLeast(SourceVersion.`3.2`))
89-
assertTrue(SourceVersion.`future-migration`.isAtLeast(SourceVersion.`3.2-migration`))
102+
// assertTrue(SourceVersion.`future-migration`.isAtLeast(SourceVersion.`3.2-migration`))
90103
assertTrue(SourceVersion.`future-migration`.isAtLeast(SourceVersion.`3.1`))
91104
assertTrue(SourceVersion.`future-migration`.isAtLeast(SourceVersion.`3.0`))
92105
assertTrue(SourceVersion.`future-migration`.isAtLeast(SourceVersion.`3.0-migration`))

0 commit comments

Comments
 (0)