scala · dottybot · Mar 19, 2021 · Mar 19, 2021
diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
@@ -229,7 +229,6 @@ class ScalaSettings extends Settings.SettingGroup with CommonScalaSettings {
   val YexplicitNulls: Setting[Boolean] = BooleanSetting("-Yexplicit-nulls", "Make reference types non-nullable. Nullable types can be expressed with unions: e.g. String|Null.")
   val YcheckInit: Setting[Boolean] = BooleanSetting("-Ysafe-init", "Ensure safe initialization of objects")
   val YrequireTargetName: Setting[Boolean] = BooleanSetting("-Yrequire-targetName", "Warn if an operator is defined without a @targetName annotation")
-  val YerasedTerms: Setting[Boolean] = BooleanSetting("-Yerased-terms", "(disabled, use -language:experimental.erasedDefinitions instead)")
 
   /** Area-specific debug output */
   val YexplainLowlevel: Setting[Boolean] = BooleanSetting("-Yexplain-lowlevel", "When explaining type errors, show types at a lower level.")

diff --git a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala
@@ -191,7 +191,7 @@ object Scanners {
     final def languageImportContext_=(c: Context) = myLanguageImportContext = c
 
     def featureEnabled(name: TermName) = Feature.enabled(name)(using languageImportContext)
-    def erasedEnabled = featureEnabled(Feature.erasedDefinitions) || ctx.settings.YerasedTerms.value
+    def erasedEnabled = featureEnabled(Feature.erasedDefinitions)
 
     /** All doc comments kept by their end position in a `Map`.
       *

diff --git a/library/src-non-bootstrapped/scala/compiletime/ops/int.scala b/library/src-non-bootstrapped/scala/compiletime/ops/int.scala
diff --git a/library/src-non-bootstrapped/scala/compiletime/package.scala b/library/src-non-bootstrapped/scala/compiletime/package.scala
diff --git a/library/src-non-bootstrapped/scala/quoted/Type.scala b/library/src-non-bootstrapped/scala/quoted/Type.scala
diff --git a/...tstrapped/scala/compiletime/ops/int.scala → library/src/scala/compiletime/ops/int.scala b/...tstrapped/scala/compiletime/ops/int.scala → library/src/scala/compiletime/ops/int.scala
diff --git a/...tstrapped/scala/compiletime/package.scala → library/src/scala/compiletime/package.scala b/...tstrapped/scala/compiletime/package.scala → library/src/scala/compiletime/package.scala
@@ -1,6 +1,8 @@
 package scala
 package compiletime
 
+import scala.language.experimental.erasedDefinitions
+
 import annotation.compileTimeOnly
 
 /** Use this method when you have a type, do not have a value for it but want to

diff --git a/.../src-bootstrapped/scala/quoted/Type.scala → library/src/scala/quoted/Type.scala b/.../src-bootstrapped/scala/quoted/Type.scala → library/src/scala/quoted/Type.scala