From 28c73fac505c2c80c684bce8c6a2da3e70f4347b Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Thu, 28 Nov 2019 14:03:55 +0100 Subject: [PATCH] Fix Scala2Compat language import It used to be import language.Scala2 even though the setting was Scala2Compat. --- compiler/src/dotty/tools/dotc/core/StdNames.scala | 1 - compiler/src/dotty/tools/dotc/core/TypeOps.scala | 13 ++----------- library/src/scalaShadowing/language.scala | 2 +- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/core/StdNames.scala b/compiler/src/dotty/tools/dotc/core/StdNames.scala index adb5a13c43ec..ad5c5d5dc9f0 100644 --- a/compiler/src/dotty/tools/dotc/core/StdNames.scala +++ b/compiler/src/dotty/tools/dotc/core/StdNames.scala @@ -358,7 +358,6 @@ object StdNames { val Ref: N = "Ref" val RootPackage: N = "RootPackage" val RootClass: N = "RootClass" - val Scala2: N = "Scala2" val Scala2Compat: N = "Scala2Compat" val Select: N = "Select" val Shape: N = "Shape" diff --git a/compiler/src/dotty/tools/dotc/core/TypeOps.scala b/compiler/src/dotty/tools/dotc/core/TypeOps.scala index aef79d55120a..9ac5be0e8f39 100644 --- a/compiler/src/dotty/tools/dotc/core/TypeOps.scala +++ b/compiler/src/dotty/tools/dotc/core/TypeOps.scala @@ -501,12 +501,7 @@ trait TypeOps { this: Context => // TODO: Make standalone object. !featureEnabled(nme.noAutoTupling) def scala2CompatMode: Boolean = - featureEnabled(nme.Scala2Compat) || { - val scala2 = featureEnabled(nme.Scala2) - if scala2 then ctx.warning("Use `-language:Scala2Compat` or `import scala.Scala2Compat` instead of `-language:Scala2` or `import scala.Scala2`") - scala2 - } - + featureEnabled(nme.Scala2Compat) def dynamicsEnabled: Boolean = featureEnabled(nme.dynamics) @@ -523,11 +518,7 @@ trait TypeOps { this: Context => // TODO: Make standalone object. * This test is used when we are too early in the pipeline to consider imports. */ def scala2CompatSetting: Boolean = - ctx.settings.language.value.contains(nme.Scala2Compat.toString) || { - val scala2 = ctx.settings.language.value.contains(nme.Scala2.toString) - if scala2 then ctx.warning("Use -language:Scala2Compat instead of -language:Scala2") - scala2 - } + ctx.settings.language.value.contains(nme.Scala2Compat.toString) /** Refine child based on parent * diff --git a/library/src/scalaShadowing/language.scala b/library/src/scalaShadowing/language.scala index 2a8da7ae32d1..ff943928d61c 100644 --- a/library/src/scalaShadowing/language.scala +++ b/library/src/scalaShadowing/language.scala @@ -213,7 +213,7 @@ object language { } /** Where imported, a backwards compatibility mode for Scala2 is enabled */ - object Scala2 + object Scala2Compat /** Where imported, auto-tupling is disabled */ object noAutoTupling