Skip to content

Commit 60480d4

Browse files
committed
Drop dotty.language from Definitions
1 parent fa461e2 commit 60480d4

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
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
@@ -517,7 +517,7 @@ trait TypeOps { this: Context => // TODO: Make standalone object.
517517
*/
518518
def featureEnabled(owner: ClassSymbol, feature: TermName): Boolean = {
519519
def toPrefix(sym: Symbol): String =
520-
if (!sym.exists || (sym eq defn.LanguageModuleClass) || (sym eq defn.Scala2LanguageModuleClass)) ""
520+
if (!sym.exists || (sym eq defn.LanguageModuleClass)) ""
521521
else toPrefix(sym.owner) + sym.name + "."
522522
def featureName = toPrefix(owner) + feature
523523
def hasImport(implicit ctx: Context): Boolean = {
@@ -536,13 +536,13 @@ trait TypeOps { this: Context => // TODO: Make standalone object.
536536

537537
/** Is auto-tupling enabled? */
538538
def canAutoTuple =
539-
!featureEnabled(defn.Scala2LanguageModuleClass, nme.noAutoTupling)
539+
!featureEnabled(defn.LanguageModuleClass, nme.noAutoTupling)
540540

541541
def scala2Mode =
542542
featureEnabled(defn.LanguageModuleClass, nme.Scala2)
543543

544544
def dynamicsEnabled =
545-
featureEnabled(defn.Scala2LanguageModuleClass, nme.dynamics)
545+
featureEnabled(defn.LanguageModuleClass, nme.dynamics)
546546

547547
def testScala2Mode(msg: String, pos: Position) = {
548548
if (scala2Mode) migrationWarning(msg, pos)

tests/pos/intersection.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import dotty.language.keepUnions
21
object intersection {
32

43
class A

0 commit comments

Comments
 (0)