WIP disable by default experimental mode on nightly builds

Author: nicolasstucki

compiler/src/dotty/tools/dotc/Driver.scala

@@ -74,7 +74,7 @@ class Driver {
     val ictx = rootCtx.fresh
     val summary = command.distill(args, ictx.settings)(ictx.settingsState)(using ictx)
     ictx.setSettings(summary.sstate)
-    Feature.checkExperimentalSettings(using ictx)
+    // Feature.checkExperimentalSettings(using ictx)
     MacroClassLoader.init(ictx)
     Positioned.init(using ictx)
 

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

@@ -150,41 +150,35 @@ object Feature:
       false
 
   def checkExperimentalFeature(which: String, srcPos: SrcPos, note: => String = "")(using Context) =
-    if !isExperimentalGloballyEnabled && !isExperimentalByImportEnabled && !isExperimentalUnstableEnabled then
+    if !isExperimentalGloballyEnabled && !isExperimentalByImportEnabled then
       report.error(
         em"""Experimental $which may only be used under experimental mode:
             |  1. In a definition marked as @experimental
             |  2. An experimental language import is in scope or within the current definition
-            |  3. Compiling with the -experimental compiler flag
-            |  4. With a nightly or snapshot version of the compiler$note
+            |     Example: import scala.language.experimental.mode
+            |  3. Compiling with the -experimental compiler flag$note
           """, srcPos)
 
   private def ccException(sym: Symbol)(using Context): Boolean =
     ccEnabled && defn.ccExperimental.contains(sym)
 
   def checkExperimentalDef(sym: Symbol, srcPos: SrcPos)(using Context) =
-    if !isExperimentalGloballyEnabled && !isExperimentalByImportEnabled && !isExperimentalUnstableEnabled then
-      val experimentalSym =
-        if sym.hasAnnotation(defn.ExperimentalAnnot) then sym
-        else if sym.owner.hasAnnotation(defn.ExperimentalAnnot) then sym.owner
-        else NoSymbol
-      if !ccException(experimentalSym) then
-        val symMsg =
-          if experimentalSym.exists
-          then i"$experimentalSym is marked @experimental"
-          else i"$sym inherits @experimental"
-        report.error(em"$symMsg and therefore may only be used in an experimental scope.", srcPos)
+    val experimentalSym =
+      if sym.hasAnnotation(defn.ExperimentalAnnot) then sym
+      else if sym.owner.hasAnnotation(defn.ExperimentalAnnot) then sym.owner
+      else NoSymbol
+    if !ccException(experimentalSym) then
+      val symMsg =
+        if experimentalSym.exists
+        then i"$experimentalSym is marked @experimental"
+        else i"$sym inherits @experimental"
+      checkExperimentalFeature("definition", srcPos, s"\n\n$symMsg")
 
   /** Check that experimental compiler options are only set for snapshot or nightly compiler versions. */
-  def checkExperimentalSettings(using Context): Unit =
-    for setting <- ctx.settings.language.value
-        if setting.startsWith("experimental.") && setting != "experimental.macros"
-    do checkExperimentalFeature(s"feature $setting", NoSourcePosition)
-
-
-  /** Experimental mode enabled by default in nightly or snapshot version of the compiler without `-Yno-experimental` */
-  def isExperimentalUnstableEnabled(using Context): Boolean =
-    Properties.experimental && !ctx.settings.YnoExperimental.value
+  // def checkExperimentalSettings(using Context): Unit =
+  //   for setting <- ctx.settings.language.value
+  //       if setting.startsWith("experimental.") && setting != "experimental.macros"
+  //   do checkExperimentalFeature(s"feature $setting", NoSourcePosition)
 
   /** Experimental mode enabled in this compilation unit
    *  - Compiled with `-experimental`

project/Build.scala

@@ -1056,6 +1056,7 @@ object Build {
     settings(
       moduleName := "scala2-library-cc",
       scalacOptions += "-Ycheck:all",
+      scalacOptions += "-language:experimental.mode",
     )
 
   lazy val scala2LibraryBootstrappedSettings = Seq(

tests/init-global/warn/i18628_3.scala

@@ -1,3 +1,4 @@
+import scala.language.experimental.mode
 import scala.annotation.init.widen
 
 object Test:

tests/neg-macros/i18677-a/Macro_1.scala

@@ -1,5 +1,4 @@
-//> using -expermiental
-
+import scala.language.experimental.mode
 import annotation.MacroAnnotation
 import quoted.*
 

tests/neg-macros/i18677-a/Test_2.scala

@@ -1,4 +1,4 @@
-//> using -expermiental
+import scala.language.experimental.mode
 
 @extendFoo
 class AFoo // error

tests/neg-macros/i18677-b/Macro_1.scala

@@ -1,5 +1,4 @@
-//> using -expermiental
-
+import scala.language.experimental.mode
 import annotation.MacroAnnotation
 import quoted.*
 

tests/neg-macros/i18677-b/Test_2.scala

@@ -1,4 +1,4 @@
-//> using -expermiental
+import scala.language.experimental.mode
 
 @extendFoo
 class AFoo // error

tests/neg-macros/newClassExtendsNoParents/Macro_1.scala

@@ -1,3 +1,4 @@
+import scala.language.experimental.mode
 import scala.quoted.*
 
 inline def makeClass(inline name: String): Any = ${ makeClassExpr('name) }

tests/neg-macros/newClassExtendsNoParents/Test_2.scala

@@ -1 +1,2 @@
+import scala.language.experimental.mode
 def test: Any = makeClass("foo") // error

tests/neg-macros/newClassExtendsOnlyTrait/Macro_1.scala

@@ -1,3 +1,4 @@
+import scala.language.experimental.mode
 import scala.quoted.*
 
 inline def makeClass(inline name: String): Foo = ${ makeClassExpr('name) }

tests/neg-macros/newClassExtendsOnlyTrait/Test_2.scala

@@ -1 +1,3 @@
+import scala.language.experimental.mode
+
 def test: Foo = makeClass("foo") // error

tests/neg/inline-unstable-accessors.scala

@@ -1,4 +1,4 @@
-//> using options -Werror -WunstableInlineAccessors -explain
+//> using options -Werror -WunstableInlineAccessors -explain -experimental
 
 package foo
 import scala.annotation.publicInBinary

tests/neg/overrides.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 class Foo {
   type A = Int
   type B >: Int <: Int

tests/neg/publicInBinaryOverride.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 import scala.annotation.publicInBinary
 
 class A:

tests/pos-macros/annot-in-object/Test_2.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 @Foo.void
 @Foo.Bar.void
 def test = 0

tests/pos-macros/annot-suspend/Test_2.scala

@@ -1,2 +1,4 @@
+import scala.language.experimental.mode
+
 @void
 def test = 0

tests/pos-macros/annot-then-inline/Test_2.scala

@@ -1,2 +1,3 @@
+import scala.language.experimental.mode
 @useInlinedIdentity
 def test = 0

tests/pos-macros/erasedArgs/Test_2.scala

@@ -1 +1,2 @@
+import scala.language.experimental.mode
 def test: "1abc" = mcr

tests/pos-macros/i15413/Macro_1.scala

@@ -1,5 +1,6 @@
 //> using options -Werror -WunstableInlineAccessors
 
+import scala.language.experimental.mode
 import scala.quoted.*
 import scala.annotation.publicInBinary
 

tests/pos-macros/i15413/Test_2.scala

@@ -1,2 +1,3 @@
+import scala.language.experimental.mode
 def test =
   new Macro().foo

tests/pos-macros/i15413b/Macro_1.scala

@@ -2,6 +2,7 @@
 
 package bar
 
+import scala.language.experimental.mode
 import scala.quoted.*
 import scala.annotation.publicInBinary
 

tests/pos-macros/i15413b/Test_2.scala

@@ -1 +1,2 @@
+import scala.language.experimental.mode
 def test = bar.foo

tests/pos-macros/i19526b/Macro.scala

@@ -1,3 +1,5 @@
+//> using options -language:experimental.mode
+
 package crash.test
 
 import scala.language.dynamics

tests/pos/TupleReverse.scala

@@ -1,3 +1,4 @@
+import scala.language.experimental.mode
 import scala.Tuple.*
 def test[T1, T2, T3, T4] =
   summon[Reverse[EmptyTuple] =:= EmptyTuple]

tests/pos/TupleReverseOnto.scala

@@ -1,3 +1,4 @@
+import scala.language.experimental.mode
 import scala.Tuple.*
 def test[T1, T2, T3, T4] =
   summon[ReverseOnto[(T1, T2), (T3, T4)] =:= ReverseOnto[(T1, T2), (T3, T4)]]

tests/pos/cc-backwards-compat/A.scala

@@ -1,4 +1,6 @@
 package p
+import scala.language.experimental.mode
+
 class A(f: Int => Int):
   def foo(f: Int => Int) = ???
   def map(other: Iter): Iter = other

tests/pos/i13091.scala

@@ -1,3 +1,3 @@
 import annotation.experimental
 @experimental class Foo
-val foo = new Foo
+@experimental val foo = new Foo

tests/pos/i7851.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 trait Wrappable[T] { }
 given Wrappable[Float] with { }
 

tests/pos/tupled-function-instances.scala

@@ -1,3 +1,4 @@
+import scala.language.experimental.mode
 import scala.util.TupledFunction
 object Test {
   def main(args: Array[String]): Unit = {

tests/run-deep-subtype/Tuple-reverse.scala

@@ -1,3 +1,4 @@
+import scala.language.experimental.mode
 import scala.reflect.ClassTag
 
 object Test {

tests/run-macros/Xmacro-settings-compileTimeEnv/Logging.scala

@@ -1,4 +1,4 @@
-import scala.compiletime.*
+import scala.language.experimental.mode
 import scala.quoted.*
 
 

tests/run-macros/Xmacro-settings-compileTimeEnv/MacroEnv.scala

@@ -1,3 +1,4 @@
+import scala.language.experimental.mode
 import scala.quoted.*
 
 object MacroEnv {

tests/run-macros/Xmacro-settings-compileTimeEnv/Test.scala

@@ -1,5 +1,6 @@
 //> using options -Xmacro-settings:a,b=1,c.b.a=x.y.z=1,myLogger.level=INFO
 
+import scala.language.experimental.mode
 import scala.compiletime.*
 
 object Test {

tests/run-macros/Xmacro-settings-simple/M1.scala

@@ -1,5 +1,6 @@
 package x
 
+import scala.language.experimental.mode
 import scala.quoted.*
 
 object M:

tests/run-macros/Xmacro-settings-simple/Test.scala

@@ -1,5 +1,6 @@
 //> using options -Xmacro-settings:one,two,three
 
+import scala.language.experimental.mode
 import x.*
 
 object Test {

tests/run-macros/annot-add-global-class/Test_2.scala

@@ -1,3 +1,4 @@
+import scala.language.experimental.mode
 import mymacro.addClass
 
 @addClass def foo(): Unit =

tests/run-macros/annot-add-global-object/Test_2.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 @addClass def foo(): Unit =
   println("macro generated main")
   println("executed in: " + (new Throwable().getStackTrace().head.getClassName))

tests/run-macros/annot-add-local-class/Test_2.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 @main def Test(): Unit =
   @addClass def foo(): Unit =
     println("macro generated main")

tests/run-macros/annot-add-local-object/Test_2.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 @main def Test(): Unit =
   @addClass def foo(): Unit =
     println("macro generated main")

tests/run-macros/annot-add-nested-class/Test_2.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 class Foo():
   @addClass def foo(): Unit =
     println("macro generated main")

tests/run-macros/annot-add-nested-object/Test_2.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 class Foo():
   @addClass def foo(): Unit =
     println("macro generated main")

tests/run-macros/annot-annot-order/Test_2.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 @print("foo")
 def foo(): Unit = ()
 

tests/run-macros/annot-bind/Test_2.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 @bind("a")
 val foo: String = "foo"
 

tests/run-macros/annot-changeVal/Test_2.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 import ChangeVal._
 
 class Bar:

tests/run-macros/annot-export/Test_2.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 object Bar:
   @returnClassName
   def f(): String = ??? // def f(): String = "Bar"

tests/run-macros/annot-generate/Macro_2.scala

@@ -1,3 +1,4 @@
+import scala.language.experimental.mode
 import scala.annotation.{experimental, MacroAnnotation}
 import scala.quoted._
 

tests/run-macros/annot-macro-main/Test_2.scala

@@ -1 +1,2 @@
+import scala.language.experimental.mode
 @mainMacro def Test(): Unit = println("macro generated main")

tests/run-macros/annot-memo/Test_2.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 class Bar:
   @memoize
   def fib(n: Int): Int =

tests/run-macros/annot-mod-class-add-def/Test_2.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 @addIndirectToString("This is Foo")
 class Foo
   //> private def string$macro$1: String = "This is Foo"

tests/run-macros/annot-mod-class-add-inner-class/Test_2.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 @addInnerClass
 class Foo
   //> class Show:

tests/run-macros/annot-mod-class-add-lazy-val/Test_2.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 @addMemoToString("This is Foo")
 class Foo
   //> private lazy val string$macro$1: String = "This is Foo"

tests/run-macros/annot-mod-class-add-local-class/Test_2.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 @addInnerClass
 class Foo
   //> def toString(): String =

tests/run-macros/annot-mod-class-add-val/Test_2.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 @addMemoToString("This is Foo")
 class Foo
   //> private val string$macro$1: String = "This is Foo"

tests/run-macros/annot-mod-class-add-var/Test_2.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 @addCountToString("This is Foo: ")
 class Foo:
   //> private var count$macro$1: Int = 0

tests/run-macros/annot-mod-class-data/Test_2.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 @data class Foo(val a: String, val b: Int)
   //> override def toString(): String = Seq(this.a, this.b).mkString("Foo(", ", ", ")")
   //> override def equals(that: Any): Boolean =

tests/run-macros/annot-mod-class-equals/Test_2.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 @equals class Foo(val a: String, val b: Int)
   //> override def equals(that: Any): Boolean =
   //>   that match

tests/run-macros/annot-mod-class-mod-def/Test_2.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 @modToString("This is Foo")
 class Foo:
   override def toString(): String = "?" //> override def toString(): String = "This is Foo"

tests/run-macros/annot-mod-class-mod-val/Test_2.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 @setValue("valDef", "a")
 @setValue("varDef", "b")
 @setValue("lazyVarDef", "c")

tests/run-macros/annot-mod-class-override-def/Test_2.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.mode
+
 @genToString("This is Foo")
 class Foo
   //> override def toString(): String = "This is Foo"