Skip to content

Commit c16cefb

Browse files
committed
Drop dotty.language from Definitions
1 parent 5084206 commit c16cefb

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

src/dotty/tools/dotc/core/Definitions.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -430,10 +430,8 @@ class Definitions {
430430
def Product_productArity(implicit ctx: Context) = Product_productArityR.symbol
431431
lazy val Product_productPrefixR = ProductClass.requiredMethodRef(nme.productPrefix)
432432
def Product_productPrefix(implicit ctx: Context) = Product_productPrefixR.symbol
433-
lazy val LanguageModuleRef = ctx.requiredModule("dotty.language")
433+
lazy val LanguageModuleRef = ctx.requiredModule("scala.language")
434434
def LanguageModuleClass(implicit ctx: Context) = LanguageModuleRef.symbol.moduleClass.asClass
435-
lazy val Scala2LanguageModuleRef = ctx.requiredModule("scala.language")
436-
def Scala2LanguageModuleClass(implicit ctx: Context) = Scala2LanguageModuleRef.symbol.moduleClass.asClass
437435
lazy val NonLocalReturnControlType: TypeRef = ctx.requiredClassRef("scala.runtime.NonLocalReturnControl")
438436

439437
lazy val ClassTagType = ctx.requiredClassRef("scala.reflect.ClassTag")

src/dotty/tools/dotc/core/TypeOps.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ trait TypeOps { this: Context => // TODO: Make standalone object.
492492
*/
493493
def featureEnabled(owner: ClassSymbol, feature: TermName): Boolean = {
494494
def toPrefix(sym: Symbol): String =
495-
if (!sym.exists || (sym eq defn.LanguageModuleClass) || (sym eq defn.Scala2LanguageModuleClass)) ""
495+
if (!sym.exists || (sym eq defn.LanguageModuleClass)) ""
496496
else toPrefix(sym.owner) + sym.name + "."
497497
def featureName = toPrefix(owner) + feature
498498
def hasImport(implicit ctx: Context): Boolean = {
@@ -511,13 +511,13 @@ trait TypeOps { this: Context => // TODO: Make standalone object.
511511

512512
/** Is auto-tupling enabled? */
513513
def canAutoTuple =
514-
!featureEnabled(defn.Scala2LanguageModuleClass, nme.noAutoTupling)
514+
!featureEnabled(defn.LanguageModuleClass, nme.noAutoTupling)
515515

516516
def scala2Mode =
517517
featureEnabled(defn.LanguageModuleClass, nme.Scala2)
518518

519519
def dynamicsEnabled =
520-
featureEnabled(defn.Scala2LanguageModuleClass, nme.dynamics)
520+
featureEnabled(defn.LanguageModuleClass, nme.dynamics)
521521

522522
def testScala2Mode(msg: String, pos: Position) = {
523523
if (scala2Mode) migrationWarning(msg, pos)

0 commit comments

Comments
 (0)