Disable experimental by default in unstable builds

nicolasstucki · nicolasstucki · commit 25970ae8c2cf · 2024-04-16T11:21:37.000+02:00
diff --git a/compiler/src/dotty/tools/dotc/config/Feature.scala b/compiler/src/dotty/tools/dotc/config/Feature.scala
@@ -163,17 +163,14 @@ object Feature:
     s"""Experimental $which may only be used under experimental mode:
        |  1. in a definition marked as @experimental, or
        |  2. an experimental feature is imported at the package level, or
-       |  3. compiling with the -experimental compiler flag, or
-       |  4. with a nightly or snapshot version of the compiler.
+       |  3. compiling with the -experimental compiler flag.
        |""".stripMargin
 
   def isExperimentalEnabled(using Context): Boolean =
-    (Properties.unstableExperimentalEnabled && !ctx.settings.YnoExperimental.value) ||
     ctx.settings.experimental.value ||
     experimentalAutoEnableFeatures.exists(enabled)
 
   def isExperimentalEnabledBySetting(using Context): Boolean =
-    (Properties.unstableExperimentalEnabled && !ctx.settings.YnoExperimental.value) ||
     ctx.settings.experimental.value ||
     experimentalAutoEnableFeatures.exists(enabledBySetting)
 
diff --git a/compiler/src/dotty/tools/dotc/config/Properties.scala b/compiler/src/dotty/tools/dotc/config/Properties.scala
@@ -84,12 +84,6 @@ trait PropertiesTrait {
    */
   val versionString: String = "version " + simpleVersionString
 
-  /** Whether the current version of compiler is experimental
-   *
-   *  Snapshot, nightly releases and non-bootstrapped compiler are experimental.
-   */
-  val unstableExperimentalEnabled: Boolean = versionString.contains("SNAPSHOT") || versionString.contains("NIGHTLY") || versionString.contains("nonbootstrapped")
-
   /** Whether the current version of compiler supports research plugins. */
   val researchPluginEnabled: Boolean = versionString.contains("SNAPSHOT") || versionString.contains("NIGHTLY") || versionString.contains("nonbootstrapped")
 
diff --git a/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala b/compiler/src/dotty/tools/dotc/config/ScalaSettings.scala
@@ -402,7 +402,7 @@ private sealed trait YSettings:
   val YretainTrees: Setting[Boolean] = BooleanSetting(ForkSetting, "Yretain-trees", "Retain trees for top-level classes, accessible from ClassSymbol#tree")
   val YshowTreeIds: Setting[Boolean] = BooleanSetting(ForkSetting, "Yshow-tree-ids", "Uniquely tag all tree nodes in debugging output.")
   val YfromTastyIgnoreList: Setting[List[String]] = MultiStringSetting(ForkSetting, "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(ForkSetting, "Yno-experimental", "Disable experimental language features by default in NIGHTLY/SNAPSHOT versions of the compiler.")
+  val YnoExperimental: Setting[Boolean] = BooleanSetting(ForkSetting, "Yno-experimental", "Disable experimental language features by default in NIGHTLY/SNAPSHOT versions of the compiler (deprecated, no-op).")
   val YlegacyLazyVals: Setting[Boolean] = BooleanSetting(ForkSetting, "Ylegacy-lazy-vals", "Use legacy (pre 3.3.0) implementation of lazy vals.")
   val YcompileScala2Library: Setting[Boolean] = BooleanSetting(ForkSetting, "Ycompile-scala2-library", "Used when compiling the Scala 2 standard library.")
   val YoutputOnlyTasty: Setting[Boolean] = BooleanSetting(ForkSetting, "Youtput-only-tasty", "Used to only generate the TASTy file without the classfiles")
diff --git a/compiler/test/dotty/tools/backend/jvm/PublicInBinaryTests.scala b/compiler/test/dotty/tools/backend/jvm/PublicInBinaryTests.scala
@@ -42,7 +42,6 @@ class PublicInBinaryTests extends DottyBytecodeTest {
   override def initCtx =
     val ctx0 = super.initCtx
     ctx0.setSetting(ctx0.settings.experimental, true)
-    ctx0.setSetting(ctx0.settings.YnoExperimental, true)
 
   @Test
   def publicInBinaryDef(): Unit = {
diff --git a/docs/_docs/reference/other-new-features/experimental-defs.md b/docs/_docs/reference/other-new-features/experimental-defs.md
@@ -265,10 +265,7 @@ Experimental definitions can only be referenced in an experimental scope. Experi
 
    </details>
 
-6. Any code compiled using a [_Nightly_](https://search.maven.org/artifact/org.scala-lang/scala3-compiler_3) or _Snapshot_ version of the compiler is considered to be in an experimental scope.
-Can use the `-Yno-experimental` compiler flag to disable it and run as a proper release.
-
-7. An experimental language feature is imported in at the package level. All top-level definitions will be marked as `@experimental`.
+6. An experimental language feature is imported in at the package level. All top-level definitions will be marked as `@experimental`.
 
 In any other situation, a reference to an experimental definition will cause a compilation error.
 
diff --git a/project/Build.scala b/project/Build.scala
@@ -1749,6 +1749,9 @@ object Build {
       SourceLinksIntegrationTest / scalaSource := baseDirectory.value / "test-source-links",
       SourceLinksIntegrationTest / test:= ((SourceLinksIntegrationTest / test) dependsOn generateScalaDocumentation.toTask("")).value,
     ).
+    settings(
+      scalacOptions += "-experimental" // workaround use of experimental .info in Scaladoc2AnchorCreator
+    ).
     settings(
       Compile / resourceGenerators ++= Seq(
         generateStaticAssetsTask.taskValue,
diff --git a/scaladoc-testcases/src/tests/hugetype.scala b/scaladoc-testcases/src/tests/hugetype.scala
@@ -31,7 +31,7 @@ trait E:
   @deprecated
   protected implicit def same[A](a: A): A
 
-trait XD extends E:
+@experimental trait XD extends E:
   /**
    * Some important information :o
    *
diff --git a/scaladoc-testcases/src/tests/methodsAndConstructors.scala b/scaladoc-testcases/src/tests/methodsAndConstructors.scala
@@ -1,5 +1,7 @@
 package tests.methodsAndConstructors
 
+import scala.language.experimental.clauseInterleaving
+
 class A
 class B extends A
 class C
@@ -60,8 +62,6 @@ class Methods:
  def withImplicitParam2(v: String)(implicit ab: Double, a: Int, b: String): String
  = ???
 
- import scala.language.experimental.clauseInterleaving
-
  def clauseInterleaving[T](x: T)[U](y: U)(using (T, U)): (T, U)
  = ???
 
diff --git a/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompiler.scala b/scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompiler.scala
@@ -27,7 +27,6 @@ class SnippetCompiler(
   object SnippetDriver extends Driver:
     val currentCtx =
       val rootCtx = initCtx.fresh.addMode(Mode.ReadPositions).addMode(Mode.Interactive)
-      rootCtx.setSetting(rootCtx.settings.YnoExperimental, true)
       rootCtx.setSetting(rootCtx.settings.experimental, true)
       rootCtx.setSetting(rootCtx.settings.YretainTrees, true)
       rootCtx.setSetting(rootCtx.settings.YcookComments, true)
diff --git a/tests/neg/experimental-message-experimental-flag.check b/tests/neg/experimental-message-experimental-flag.check
@@ -7,5 +7,4 @@
   |          Experimental definition may only be used under experimental mode:
   |            1. in a definition marked as @experimental, or
   |            2. an experimental feature is imported at the package level, or
-  |            3. compiling with the -experimental compiler flag, or
-  |            4. with a nightly or snapshot version of the compiler.
+  |            3. compiling with the -experimental compiler flag.
diff --git a/tests/neg/experimental-message.check b/tests/neg/experimental-message.check
@@ -6,8 +6,7 @@
    |  Experimental definition may only be used under experimental mode:
    |    1. in a definition marked as @experimental, or
    |    2. an experimental feature is imported at the package level, or
-   |    3. compiling with the -experimental compiler flag, or
-   |    4. with a nightly or snapshot version of the compiler.
+   |    3. compiling with the -experimental compiler flag.
 -- Error: tests/neg/experimental-message.scala:16:2 --------------------------------------------------------------------
 16 |  f2() // error
    |  ^^
@@ -16,8 +15,7 @@
    |  Experimental definition may only be used under experimental mode:
    |    1. in a definition marked as @experimental, or
    |    2. an experimental feature is imported at the package level, or
-   |    3. compiling with the -experimental compiler flag, or
-   |    4. with a nightly or snapshot version of the compiler.
+   |    3. compiling with the -experimental compiler flag.
 -- Error: tests/neg/experimental-message.scala:17:2 --------------------------------------------------------------------
 17 |  f3() // error
    |  ^^
@@ -26,5 +24,4 @@
    |  Experimental definition may only be used under experimental mode:
    |    1. in a definition marked as @experimental, or
    |    2. an experimental feature is imported at the package level, or
-   |    3. compiling with the -experimental compiler flag, or
-   |    4. with a nightly or snapshot version of the compiler.
+   |    3. compiling with the -experimental compiler flag.
diff --git a/tests/neg/i13091.check b/tests/neg/i13091.check
@@ -12,5 +12,4 @@
   |                     Experimental definition may only be used under experimental mode:
   |                       1. in a definition marked as @experimental, or
   |                       2. an experimental feature is imported at the package level, or
-  |                       3. compiling with the -experimental compiler flag, or
-  |                       4. with a nightly or snapshot version of the compiler.
+  |                       3. compiling with the -experimental compiler flag.
diff --git a/tests/neg/overrides.scala b/tests/neg/overrides.scala
@@ -1,3 +1,5 @@
+//> using options -experimental
+
 class Foo {
   type A = Int
   type B >: Int <: Int
diff --git a/tests/neg/use-experimental-def.check b/tests/neg/use-experimental-def.check
@@ -6,5 +6,4 @@
   |               Experimental definition may only be used under experimental mode:
   |                 1. in a definition marked as @experimental, or
   |                 2. an experimental feature is imported at the package level, or
-  |                 3. compiling with the -experimental compiler flag, or
-  |                 4. with a nightly or snapshot version of the compiler.
+  |                 3. compiling with the -experimental compiler flag.
diff --git a/tests/pos-custom-args/captures/curried-closures.scala b/tests/pos-custom-args/captures/curried-closures.scala
@@ -1,3 +1,5 @@
+//> using options -experimental
+
 object Test:
   def map2(xs: List[Int])(f: Int => Int): List[Int] = xs.map(f)
   val f1 = map2
diff --git a/tests/pos-macros/erasedArgs/Test_2.scala b/tests/pos-macros/erasedArgs/Test_2.scala
@@ -1 +1,3 @@
+//> using options -experimental
+
 def test: "1abc" = mcr
diff --git a/tests/pos/TupleReverse.scala b/tests/pos/TupleReverse.scala
@@ -1,3 +1,5 @@
+//> using options -experimental
+
 import scala.Tuple.*
 def test[T1, T2, T3, T4] =
   summon[Reverse[EmptyTuple] =:= EmptyTuple]
diff --git a/tests/pos/experimental-flag.scala b/tests/pos/experimental-flag.scala
diff --git a/tests/pos/i13091.scala b/tests/pos/i13091.scala
diff --git a/tests/pos/overrides.scala b/tests/pos/overrides.scala
@@ -1,7 +1,9 @@
+//> using options -experimental
+
 class A[T] {
 
   def f(x: T)(y: T = x) = y
-  
+
   import scala.language.experimental.clauseInterleaving
 
   def b[U <: T](x: Int)[V >: T](y: String) = false
diff --git a/tests/pos/phantom-Eq2/Phantom-Eq_2.scala b/tests/pos/phantom-Eq2/Phantom-Eq_2.scala
@@ -1,3 +1,4 @@
+//> using options -experimental
 
 /* This is a version of ../pos/phantom.scala that tests phantom clases with separate compilation */
 object PhantomEq {
diff --git a/tests/run-macros/i17105/Test_3.scala b/tests/run-macros/i17105/Test_3.scala
@@ -1,3 +1,5 @@
+//> using options -experimental
+
 import reflect.Selectable.reflectiveSelectable
 
 class Hoe { def f(x: Int): String = s"Hoe got ${x}" }
diff --git a/tests/run-macros/macro-erased/Test_2.scala b/tests/run-macros/macro-erased/Test_2.scala
@@ -1,3 +1,5 @@
+//> using options -experimental
+
 object Test {
   def main(args: Array[String]): Unit = {
     assert(Macro.foo1(1) == 0)
diff --git a/tests/run/interleaving.scala b/tests/run/interleaving.scala
@@ -1,5 +1,6 @@
+import scala.language.experimental.clauseInterleaving
+
 object Test extends App {
-  import scala.language.experimental.clauseInterleaving
   trait Key { type Value }
   trait DB {
     def getOrElse(k: Key)[V >: k.Value](default: V): V // dependent type parameter
diff --git a/tests/run/publicInBinary/Test_2.scala b/tests/run/publicInBinary/Test_2.scala
@@ -1,3 +1,4 @@
+//> using options -experimental
 import foo.*
 
 @main def Test: Unit =

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ trait E:`
`31`	`31`	`@deprecated`
`32`	`32`	`protected implicit def same[A](a: A): A`
`33`	`33`
`34`		`-trait XD extends E:`
	`34`	`+@experimental trait XD extends E:`
`35`	`35`	`/**`
`36`	`36`	`* Some important information :o`
`37`	`37`	`*`