Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor config.MigrationVersion #21399

Merged
merged 2 commits into from
Aug 23, 2024
Merged

Refactor config.MigrationVersion #21399

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a53c8cf
Refactor MigrationVersion to be an enum
hamzaremmal Aug 19, 2024
a818608
Merge branch 'main' into refactor-migration-version
hamzaremmal Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 25 additions & 37 deletions compiler/src/dotty/tools/dotc/config/MigrationVersion.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,48 +6,36 @@ import SourceVersion.*
import Feature.*
import core.Contexts.Context

class MigrationVersion(
val warnFrom: SourceVersion,
val errorFrom: SourceVersion):
require(warnFrom.ordinal <= errorFrom.ordinal)

def needsPatch(using Context): Boolean =
sourceVersion.isMigrating && sourceVersion.isAtLeast(warnFrom)

def patchFrom: SourceVersion =
warnFrom.prevMigrating

object MigrationVersion:

val Scala2to3 = MigrationVersion(`3.0`, `3.0`)

val OverrideValParameter = MigrationVersion(`3.0`, future)

enum MigrationVersion(val warnFrom: SourceVersion, val errorFrom: SourceVersion):
case Scala2to3 extends MigrationVersion(`3.0`, `3.0`)
case OverrideValParameter extends MigrationVersion(`3.0`, future)
// we tighten for-comprehension without `case` to error in 3.4,
// but we keep pat-defs as warnings for now ("@unchecked"),
// until we propose an alternative way to assert exhaustivity to the typechecker.
val ForComprehensionPatternWithoutCase = MigrationVersion(`3.2`, `3.4`)
val ForComprehensionUncheckedPathDefs = MigrationVersion(`3.2`, future)

val NonLocalReturns = MigrationVersion(`3.2`, future)

val AscriptionAfterPattern = MigrationVersion(`3.3`, future)

val ExplicitContextBoundArgument = MigrationVersion(`3.4`, `3.5`)
case ForComprehensionPatternWithoutCase extends MigrationVersion(`3.2`, `3.4`)
case ForComprehensionUncheckedPathDefs extends MigrationVersion(`3.2`, future)

case NonLocalReturns extends MigrationVersion(`3.2`, future)
case AscriptionAfterPattern extends MigrationVersion(`3.3`, future)
case ExplicitContextBoundArgument extends MigrationVersion(`3.4`, `3.5`)
case AlphanumericInfix extends MigrationVersion(`3.4`, future)
case RemoveThisQualifier extends MigrationVersion(`3.4`, future)
case UninitializedVars extends MigrationVersion(`3.4`, future)
case VarargSpliceAscription extends MigrationVersion(`3.4`, future)
case WildcardType extends MigrationVersion(`3.4`, future)
case WithOperator extends MigrationVersion(`3.4`, future)
case FunctionUnderscore extends MigrationVersion(`3.4`, future)
case NonNamedArgumentInJavaAnnotation extends MigrationVersion(`3.6`, `3.6`)
case ImportWildcard extends MigrationVersion(future, future)
case ImportRename extends MigrationVersion(future, future)
case ParameterEnclosedByParenthesis extends MigrationVersion(future, future)
case XmlLiteral extends MigrationVersion(future, future)

val AlphanumericInfix = MigrationVersion(`3.4`, future)
val RemoveThisQualifier = MigrationVersion(`3.4`, future)
val UninitializedVars = MigrationVersion(`3.4`, future)
val VarargSpliceAscription = MigrationVersion(`3.4`, future)
val WildcardType = MigrationVersion(`3.4`, future)
val WithOperator = MigrationVersion(`3.4`, future)
val FunctionUnderscore = MigrationVersion(`3.4`, future)
require(warnFrom.ordinal <= errorFrom.ordinal)

val NonNamedArgumentInJavaAnnotation = MigrationVersion(`3.6`, `3.6`)
def needsPatch(using Context): Boolean =
sourceVersion.isMigrating && sourceVersion.isAtLeast(warnFrom)

val ImportWildcard = MigrationVersion(future, future)
val ImportRename = MigrationVersion(future, future)
val ParameterEnclosedByParenthesis = MigrationVersion(future, future)
val XmlLiteral = MigrationVersion(future, future)
def patchFrom: SourceVersion = warnFrom.prevMigrating

end MigrationVersion
Loading