Revert #11852: only enable experimental features for snapshot and nightly

This reverts PR #11852. See #11915.

Author: liufengyun

community-build/community-projects/stdLib213

@@ -10,9 +10,6 @@ lazy val compilerVersion: String =
   val file = communitybuildDir.resolve("scala3-bootstrapped.version")
   new String(Files.readAllBytes(file), UTF_8)
 
-lazy val compilerSupportExperimental: Boolean =
-  compilerVersion.contains("SNAPSHOT") || compilerVersion.contains("NIGHTLY")
-
 lazy val sbtPluginFilePath: String =
   // Workaround for https://github.com/sbt/sbt/issues/4395
   new File(sys.props("user.home") + "/.sbt/1.0/plugins").mkdirs()

community-build/src/scala/dotty/communitybuild/projects.scala

@@ -116,7 +116,7 @@ class CommunityBuildTestB extends CommunityBuildTest:
   @Test def disciplineSpecs2 = projects.disciplineSpecs2.run()
   @Test def munit = projects.munit.run()
   @Test def perspective = projects.perspective.run()
-  @Test def scodec = if (compilerSupportExperimental) projects.scodec.run()
+  @Test def scodec = projects.scodec.run()
   @Test def scodecBits = projects.scodecBits.run()
   @Test def simulacrumScalafixAnnotations = projects.simulacrumScalafixAnnotations.run()
 end CommunityBuildTestB

community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala

@@ -32,13 +32,10 @@ object Feature:
 
   /** Experimental features are only enabled for snapshot and nightly compiler versions
    */
-  def experimentalEnabled(using Context): Boolean =
-    Properties.experimental && !ctx.settings.YnoExperimental.value
-
-  def isExperimental(feature: TermName): Boolean =
-    feature != scala2macros && feature.match
-    case QualifiedName(nme.experimental, _) => true
-    case _ => false
+  def checkExperimentalFeature(feature: TermName): Boolean =
+    feature match
+    case QualifiedName(nme.experimental, _) => Properties.experimental
+    case _ => true
 
   /** Is `feature` enabled by by a command-line setting? The enabling setting is
    *
@@ -72,8 +69,7 @@ object Feature:
    *  Note: Experimental features are only enabled for snapshot and nightly version of compiler.
    */
   def enabled(feature: TermName)(using Context): Boolean =
-    (experimentalEnabled || !isExperimental(feature))
-    && (enabledBySetting(feature) || enabledByImport(feature))
+    checkExperimentalFeature(feature) && (enabledBySetting(feature) || enabledByImport(feature))
 
   /** Is auto-tupling enabled? */
   def autoTuplingEnabled(using Context): Boolean = !enabled(nme.noAutoTupling)
@@ -116,10 +112,8 @@ object Feature:
 
   /** Check that experimental compiler options are only set for snapshot or nightly compiler versions. */
   def checkExperimentalFlags(using Context): Unit =
-    if !experimentalEnabled then
-      val features = ctx.settings.language.value.filter { feature =>
-        feature.contains(nme.experimental.toString) && !feature.contains("macros")
-      }
+    if !Properties.experimental then
+      val features = ctx.settings.language.value.filter(_.contains(nme.experimental.toString))
       if features.nonEmpty then
         report.error(
           experimentalWarningMessage +

compiler/src/dotty/tools/dotc/config/Feature.scala

@@ -11,7 +11,7 @@ import java.nio.charset.StandardCharsets
 /** Loads `library.properties` from the jar. */
 object Properties extends PropertiesTrait {
   protected def propCategory: String = "compiler"
-  protected def pickJarBasedOn: Class[PropertiesTrait] = classOf[PropertiesTrait]
+  protected def pickJarBasedOn: Class[Option[?]] = classOf[Option[?]]
 
   /** Scala manifest attributes.
    */

compiler/src/dotty/tools/dotc/config/Properties.scala

@@ -215,7 +215,6 @@ class ScalaSettings extends Settings.SettingGroup with CommonScalaSettings {
   val YretainTrees: Setting[Boolean] = BooleanSetting("-Yretain-trees", "Retain trees for top-level classes, accessible from ClassSymbol#tree")
   val YshowTreeIds: Setting[Boolean] = BooleanSetting("-Yshow-tree-ids", "Uniquely tag all tree nodes in debugging output.")
   val YfromTastyIgnoreList: Setting[List[String]] = MultiStringSetting("-Yfrom-tasty-ignore-list", "file", "List of `tasty` files in jar files that will not be loaded when using -from-tasty")
-  val YnoExperimental: Setting[Boolean] = BooleanSetting("-Yno-experimental", "Disable experimental language features")
 
   val YprofileEnabled: Setting[Boolean] = BooleanSetting("-Yprofile-enabled", "Enable profiling.")
   val YprofileDestination: Setting[String] = StringSetting("-Yprofile-destination", "file", "Where to send profiling output - specify a file, default is to the console.", "")

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

@@ -520,7 +520,6 @@ object StdNames {
     val longHash: N             = "longHash"
     val macroThis : N           = "_this"
     val macroContext : N        = "c"
-    val macros: N               = "macros"
     val main: N                 = "main"
     val manifest: N             = "manifest"
     val ManifestFactory: N      = "ManifestFactory"

compiler/src/dotty/tools/dotc/core/StdNames.scala

@@ -3080,10 +3080,7 @@ object Parsers {
       val imp = Import(tree, selectors)
       if isLanguageImport(tree) then
         in.languageImportContext = in.languageImportContext.importContext(imp, NoSymbol)
-        if isExperimentalImport(tree)
-           && !Feature.experimentalEnabled
-           && selectors.exists(_.name != nme.macros)
-        then
+        if isExperimentalImport(tree) && !Properties.experimental then
           report.error(Feature.experimentalWarningMessage, imp.srcPos)
         for
           case ImportSelector(id @ Ident(imported), EmptyTree, _) <- selectors

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -118,6 +118,7 @@ class BootstrappedOnlyCompilationTests {
     aggregateTests(
       compileFilesInDir("tests/run-macros", defaultOptions.and("-Xcheck-macros")),
       compileFilesInDir("tests/run-custom-args/Yretain-trees", defaultOptions and "-Yretain-trees"),
+      compileFilesInDir("tests/run-custom-args/run-macros-erased", defaultOptions.and("-language:experimental.erasedDefinitions").and("-Xcheck-macros")),
     )
   }.checkRuns()
 
@@ -198,24 +199,6 @@ class BootstrappedOnlyCompilationTests {
     compileFilesInDir("tests/plugins/neg").checkExpectedErrors()
     compileDir("tests/plugins/custom/analyzer", withCompilerOptions.and("-Yretain-trees")).checkCompile()
   }
-
-  // tests for experimental featuress ------------------------------------------
-
-  @Test def experimental: Unit =
-    implicit val testGroup: TestGroup = TestGroup("experimental")
-    val enableExperimental = defaultOptions.without("-Yno-experimental")
-    val enableErased = enableExperimental.and("-language:experimental.erasedDefinitions")
-    compileFilesInDir("tests/neg-custom-args/no-experimental", defaultOptions.and("-Yno-experimental")).checkExpectedErrors()
-    if config.Properties.experimental then
-      compileFilesInDir("tests/run-custom-args/experimental", enableExperimental).checkRuns()
-      compileFilesInDir("tests/neg-custom-args/experimental", enableExperimental).checkExpectedErrors()
-      compileFilesInDir("tests/pos-custom-args/experimental", enableExperimental).checkCompile()
-      compileFilesInDir("tests/run-staging-experimental", withStagingOptions.without("-Yno-experimental")).checkRuns()
-      compileFilesInDir("tests/neg-custom-args/erased", enableErased).checkExpectedErrors()
-      compileFilesInDir("tests/pos-custom-args/erased", enableErased).checkCompile()
-      compileFilesInDir("tests/run-custom-args/run-macros-erased", enableErased.and("-Xcheck-macros")).checkRuns()
-      compileFilesInDir("tests/run-custom-args/erased", enableErased)
-
 }
 
 object BootstrappedOnlyCompilationTests extends ParallelTesting {

compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala

@@ -39,6 +39,7 @@ class CompilationTests {
       compileFilesInDir("tests/pos-special/isInstanceOf", allowDeepSubtypes.and("-Xfatal-warnings")),
       compileFilesInDir("tests/new", defaultOptions),
       compileFilesInDir("tests/pos-scala2", scala2CompatMode),
+      compileFilesInDir("tests/pos-custom-args/erased", defaultOptions.and("-language:experimental.erasedDefinitions")),
       compileFilesInDir("tests/pos", defaultOptions.and("-Ysafe-init")),
       compileFilesInDir("tests/pos-deep-subtype", allowDeepSubtypes),
       compileDir("tests/pos-special/java-param-names", defaultOptions.withJavacOnlyOptions("-parameters")),
@@ -125,6 +126,7 @@ class CompilationTests {
       compileFilesInDir("tests/neg-no-kind-polymorphism", defaultOptions and "-Yno-kind-polymorphism"),
       compileFilesInDir("tests/neg-custom-args/deprecation", defaultOptions.and("-Xfatal-warnings", "-deprecation")),
       compileFilesInDir("tests/neg-custom-args/fatal-warnings", defaultOptions.and("-Xfatal-warnings")),
+      compileFilesInDir("tests/neg-custom-args/erased", defaultOptions.and("-language:experimental.erasedDefinitions")),
       compileFilesInDir("tests/neg-custom-args/allow-double-bindings", allowDoubleBindings),
       compileFilesInDir("tests/neg-custom-args/allow-deep-subtypes", allowDeepSubtypes),
       compileFilesInDir("tests/neg-custom-args/explicit-nulls", defaultOptions.and("-Yexplicit-nulls")),
@@ -163,7 +165,9 @@ class CompilationTests {
       compileDir("tests/neg-custom-args/adhoc-extension", defaultOptions.and("-source", "future", "-feature", "-Xfatal-warnings")),
       compileFile("tests/neg/i7575.scala", defaultOptions.withoutLanguageFeatures.and("-language:_")),
       compileFile("tests/neg-custom-args/kind-projector.scala", defaultOptions.and("-Ykind-projector")),
+      compileFile("tests/neg-custom-args/typeclass-derivation2.scala", defaultOptions.and("-language:experimental.erasedDefinitions")),
       compileFile("tests/neg-custom-args/i5498-postfixOps.scala", defaultOptions withoutLanguageFeature "postfixOps"),
+      compileFile("tests/neg-custom-args/deptypes.scala", defaultOptions.and("-language:experimental.dependent")),
       compileFile("tests/neg-custom-args/matchable.scala", defaultOptions.and("-Xfatal-warnings", "-source", "future")),
       compileFile("tests/neg-custom-args/i7314.scala", defaultOptions.and("-Xfatal-warnings", "-source", "future")),
       compileFile("tests/neg-custom-args/feature-shadowing.scala", defaultOptions.and("-Xfatal-warnings", "-feature")),
@@ -185,6 +189,7 @@ class CompilationTests {
       compileFile("tests/run-custom-args/fors.scala", defaultOptions.and("-source", "future")),
       compileFile("tests/run-custom-args/no-useless-forwarders.scala", defaultOptions and "-Xmixin-force-forwarders:false"),
       compileFile("tests/run-custom-args/defaults-serizaliable-no-forwarders.scala", defaultOptions and "-Xmixin-force-forwarders:false"),
+      compileFilesInDir("tests/run-custom-args/erased", defaultOptions.and("-language:experimental.erasedDefinitions")),
       compileFilesInDir("tests/run-deep-subtype", allowDeepSubtypes),
       compileFilesInDir("tests/run", defaultOptions.and("-Ysafe-init"))
     ).checkRuns()
@@ -243,6 +248,7 @@ class CompilationTests {
     val lib =
       compileList("lib", librarySources,
         defaultOptions.and("-Ycheck-reentrant",
+          "-language:experimental.erasedDefinitions", // support declaration of scala.compiletime.erasedValue
           //  "-source", "future",  // TODO: re-enable once we allow : @unchecked in pattern definitions. Right now, lots of narrowing pattern definitions fail.
           ))(libGroup)
 

compiler/test/dotty/tools/dotc/CompilationTests.scala

@@ -9,7 +9,6 @@ object TestConfiguration {
   val noCheckOptions = Array(
     "-pagewidth", "120",
     "-color:never",
-    "-Yno-experimental",
     "-Xtarget", defaultTarget
   )
 

compiler/test/dotty/tools/vulpix/TestConfiguration.scala

@@ -466,8 +466,6 @@ object Build {
       // Add git-hash used to package the distribution to the manifest to know it in runtime and report it in REPL
       packageOptions += ManifestAttributes(("Git-Hash", VersionUtil.gitHash)),
 
-      scalacOptions += "-Yno-experimental",
-
       javaOptions ++= {
         val managedSrcDir = {
           // Populate the directory

project/Build.scala

@@ -1,4 +1,3 @@
-import language.experimental.dependent
 
 type Vec[T] = (n: Int) =>> Array[T] // error: not yet implemented
 

tests/neg-custom-args/experimental/deptypes.scala renamed to tests/neg-custom-args/deptypes.scala

@@ -1,5 +1,3 @@
-import language.experimental.erasedDefinitions
-
 import scala.collection.mutable
 import scala.annotation.tailrec
 

tests/neg-custom-args/no-experimental/experimental.scala

@@ -48,3 +48,4 @@ object BigFloat extends App {
       '{BigInt(${Expr(x.toString)})}
   }
 }
+

tests/neg-custom-args/erased/typeclass-derivation2.scala renamed to tests/neg-custom-args/typeclass-derivation2.scala

@@ -0,0 +1,19 @@
+import language.experimental.genericNumberLiterals
+import scala.util.FromDigits
+import scala.quoted.*
+import Even.*
+
+object EvenFromDigitsImpl:
+  def apply(digits: Expr[String])(using Quotes): Expr[Even] = digits.value match {
+    case Some(ds) =>
+      val ev =
+        try evenFromDigits(ds)
+        catch {
+          case ex: FromDigits.FromDigitsException =>
+            quotes.reflect.report.error(ex.getMessage)
+            Even(0)
+        }
+      '{Even(${Expr(ev.n)})}
+    case _ =>
+      '{evenFromDigits($digits)}
+  }

tests/neg-custom-args/experimental/BigFloat/BigFloatFromDigitsImpl_1.scala renamed to tests/neg-macros/BigFloat/BigFloatFromDigitsImpl_1.scala

@@ -0,0 +1,24 @@
+import language.experimental.genericNumberLiterals
+import scala.util.FromDigits
+import scala.quoted.*
+
+
+case class Even(n: Int)
+object Even {
+
+  def evenFromDigits(digits: String): Even = {
+    val intValue = FromDigits.intFromDigits(digits)
+    if (intValue % 2 == 0) Even(intValue)
+    else throw FromDigits.MalformedNumber(s"$digits is odd")
+  }
+
+  class EvenFromDigits extends FromDigits[Even] {
+    def fromDigits(digits: String) = evenFromDigits(digits)
+  }
+
+  given EvenFromDigits with {
+    override inline def fromDigits(digits: String) = ${
+      EvenFromDigitsImpl('digits)
+    }
+  }
+}

tests/neg-custom-args/experimental/BigFloat/BigFloat_1.scala renamed to tests/neg-macros/BigFloat/BigFloat_1.scala

@@ -0,0 +1,6 @@
+import language.experimental.genericNumberLiterals
+object Test extends App {
+
+  val e1: Even = 1234
+  val e2: Even = 123  // error: 123 is odd
+}

tests/neg-custom-args/experimental/BigFloat/Test_2.scala renamed to tests/neg-macros/BigFloat/Test_2.scala

@@ -8,3 +8,5 @@ erased trait D
 
 val x = new A{} // ok, x is erased
 val y = new C with D{} // error
+
+

tests/neg-custom-args/experimental/GenericNumLits/EvenFromDigitsImpl_1.scala renamed to tests/neg-macros/GenericNumLits/EvenFromDigitsImpl_1.scala

@@ -20,3 +20,4 @@ object d:
   import language.experimental.genericNumberLiterals // ok
   import scala.language.noAutoTupling  // ok
   import _root_.scala.language.strictEquality // ok
+

tests/neg-custom-args/experimental/GenericNumLits/Even_1.scala renamed to tests/neg-macros/GenericNumLits/Even_1.scala

@@ -1,2 +1,3 @@
 import language.experimental.erasedDefinitions
 erased class A
+

tests/neg-custom-args/experimental/GenericNumLits/Test_2.scala renamed to tests/neg-macros/GenericNumLits/Test_2.scala

@@ -48,3 +48,4 @@ object BigFloat extends App {
       '{BigInt(${Expr(x.toString)})}
   }
 }
+