Skip to content

Commit e66794f

Browse files
committed
Revert "add source versions 3.2 and 3.2-migration"
This reverts commit bd5a808.
1 parent a49705e commit e66794f

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

compiler/src/dotty/tools/dotc/config/Feature.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ object Feature:
9191
def warnOnMigration(msg: Message, pos: SrcPos,
9292
version: SourceVersion)(using Context): Boolean =
9393
if sourceVersion.isMigrating && sourceVersion.stable == version
94-
|| (version == `3.0` || version == `3.1` || version == `3.2`) && migrateTo3
94+
|| (version == `3.0` || version == `3.1`) && migrateTo3
9595
then
9696
report.migrationWarning(msg, pos)
9797
true

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ trait AllScalaSettings extends CommonScalaSettings, PluginSettings, VerboseSetti
5151
/* Path related settings */
5252
val semanticdbTarget: Setting[String] = PathSetting("-semanticdb-target", "Specify an alternative output directory for SemanticDB files.", "")
5353

54-
val source: Setting[String] = ChoiceSetting("-source", "source version", "source version", List("3.0", "3.1", "3.2", "future", "3.0-migration", "3.1-migration", "3.2-migration", "future-migration"), "3.0", aliases = List("--source"))
54+
val source: Setting[String] = ChoiceSetting("-source", "source version", "source version", List("3.0", "3.1", "future", "3.0-migration", "future-migration"), "3.0", aliases = List("--source"))
5555
val uniqid: Setting[Boolean] = BooleanSetting("-uniqid", "Uniquely tag all identifiers in debugging output.", aliases = List("--unique-id"))
5656
val rewrite: Setting[Option[Rewrites]] = OptionSetting[Rewrites]("-rewrite", "When used in conjunction with a `...-migration` source version, rewrites sources to migrate to new version.", aliases = List("--rewrite"))
5757
val fromTasty: Setting[Boolean] = BooleanSetting("-from-tasty", "Compile classes from tasty files. The arguments are .tasty or .jar files.", aliases = List("--from-tasty"))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import core.Decorators.*
66
import util.Property
77

88
enum SourceVersion:
9-
case `3.0-migration`, `3.0`, `3.1-migration`, `3.1`, `3.2-migration`, `3.2`, `future-migration`, `future`
9+
case `3.0-migration`, `3.0`, `3.1`, `future-migration`, `future`
1010

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

library/src/scala/runtime/stdLibPatches/language.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ object language:
162162
@compileTimeOnly("`3.1` can only be used at compile time in import statements")
163163
object `3.1`
164164

165+
/* This can be added when we go to 3.2
165166
/** Set source version to 3.2-migration.
166167
*
167168
* @see [[https://scalacenter.github.io/scala-3-migration-guide/docs/scala-3-migration-mode]]
@@ -175,4 +176,5 @@ object language:
175176
*/
176177
@compileTimeOnly("`3.2` can only be used at compile time in import statements")
177178
object `3.2`
179+
*/
178180
end language

0 commit comments

Comments
 (0)