Add `scala.language.{3.1, 3.1-migration}`

Fixes #13773
scala · Oct 22, 2021 · fe23bae · fe23bae
1 parent 7e06899
commit fe23bae
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 1 deletion.
diff --git a/library/src/scala/runtime/stdLibPatches/language.scala b/library/src/scala/runtime/stdLibPatches/language.scala
@@ -148,17 +148,33 @@ object language:
   @compileTimeOnly("`3.0` can only be used at compile time in import statements")
   object `3.0`
 
-/* This can be added when we go to 3.1
   /** Set source version to 3.1-migration.
     *
     * @see [[https://scalacenter.github.io/scala-3-migration-guide/docs/scala-3-migration-mode]]
     */
+  @compileTimeOnly("`3.1-migration` can only be used at compile time in import statements")
   object `3.1-migration`
 
   /** Set source version to 3.1
     *
     * @see [[https://scalacenter.github.io/scala-3-migration-guide/docs/scala-3-migration-mode]]
     */
+  @compileTimeOnly("`3.1` can only be used at compile time in import statements")
   object `3.1`
+
+/* This can be added when we go to 3.2
+  /** Set source version to 3.2-migration.
+    *
+    * @see [[https://scalacenter.github.io/scala-3-migration-guide/docs/scala-3-migration-mode]]
+    */
+  @compileTimeOnly("`3.2-migration` can only be used at compile time in import statements")
+  object `3.2-migration`
+
+  /** Set source version to 3.2
+    *
+    * @see [[https://scalacenter.github.io/scala-3-migration-guide/docs/scala-3-migration-mode]]
+    */
+  @compileTimeOnly("`3.2` can only be used at compile time in import statements")
+  object `3.2`
 */
 end language
diff --git a/project/MiMaFilters.scala b/project/MiMaFilters.scala
@@ -9,5 +9,13 @@ object MiMaFilters {
     ProblemFilters.exclude[DirectMissingMethodProblem]("scala.runtime.Tuples.append"),
     ProblemFilters.exclude[ReversedMissingMethodProblem]("scala.quoted.Quotes#reflectModule#TypeReprMethods.substituteTypes"),
     ProblemFilters.exclude[DirectMissingMethodProblem]("scala.quoted.Quotes#reflectModule#TypeReprMethods.substituteTypes"),
+
+    // Should have been added in 3.1.0
+    // These are `@compileTimeOnly` and therefore should not be present in binaries emitted before
+    // this addition of these members and therefore should not cause any conflicts.
+    ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language.3.1-migration"),
+    ProblemFilters.exclude[MissingFieldProblem]("scala.runtime.stdLibPatches.language.3.1"),
+    ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$3$u002E1$"),
+    ProblemFilters.exclude[MissingClassProblem]("scala.runtime.stdLibPatches.language$3$u002E1$minusmigration$"),
   )
 }
diff --git a/tests/pos/source-import-3-0-migration.scala b/tests/pos/source-import-3-0-migration.scala
@@ -0,0 +1 @@
+import language.`3.0-migration`
diff --git a/tests/pos/source-import-3-0.scala b/tests/pos/source-import-3-0.scala
@@ -0,0 +1 @@
+import language.`3.0`
diff --git a/tests/pos/source-import-3-1-migration.scala b/tests/pos/source-import-3-1-migration.scala
@@ -0,0 +1 @@
+import language.`3.1-migration`
diff --git a/tests/pos/source-import-3-1.scala b/tests/pos/source-import-3-1.scala
@@ -0,0 +1 @@
+import language.`3.1`