make unroll a preview feature

bishabosha · bishabosha · commit 0699b7908e2f · 2026-01-05T16:50:19.000Z
diff --git a/docs/_docs/reference/preview/unrolled-defs.md b/docs/_docs/reference/preview/unrolled-defs.md
@@ -1,7 +1,7 @@
 ---
 layout: doc-page
 title: "Automatic Parameter Unrolling"
-nightlyOf: https://docs.scala-lang.org/scala3/reference/experimental/unrolled-defs.html
+nightlyOf: https://docs.scala-lang.org/scala3/reference/preview/unrolled-defs.html
 ---
 
 Parameter unrolling enables new parameters to be added to methods and classes,
diff --git a/docs/sidebar.yml b/docs/sidebar.yml
@@ -143,6 +143,7 @@ subsection:
     index: reference/preview/overview.md
     subsection:
       - page: reference/preview/into.md
+      - page: reference/preview/unrolled-defs.md
   - title: Experimental Features
     directory: experimental
     index: reference/experimental/overview.md
@@ -178,7 +179,6 @@ subsection:
       - page: reference/experimental/tupled-function.md
       - page: reference/experimental/modularity.md
       - page: reference/experimental/typeclasses.md
-      - page: reference/experimental/unrolled-defs.md
       - page: reference/experimental/package-object-values.md
       - page: reference/experimental/quoted-patterns-with-polymorphic-functions.md
       - page: reference/experimental/relaxed-lambdas.md
diff --git a/library/src/scala/annotation/unroll.scala b/library/src/scala/annotation/unroll.scala
@@ -1,8 +1,9 @@
 package scala.annotation
 
 import language.experimental.captureChecking
+import scala.annotation.internal.preview
 
-@experimental("under review as part of SIP-61")
+@preview
 /**The `@unroll` annotation is reserved for parameters of classes and methods.
  *
  * It enables to add new parameters while preserving backwards binary compatibility,
diff --git a/repl/test/dotty/tools/repl/ReplCompilerTests.scala b/repl/test/dotty/tools/repl/ReplCompilerTests.scala
@@ -582,7 +582,7 @@ class ReplHighlightTests extends ReplTest(ReplTest.defaultOptions.filterNot(_.st
       def deepTree(depth: Int): Tree
       deepTree(300)""")
 
-class ReplUnrollTests extends ReplTest(ReplTest.defaultOptions ++ Seq("-experimental", "-Xprint:pickler")):
+class ReplUnrollTests extends ReplTest(ReplTest.defaultOptions ++ Seq("-preview", "-Xprint:pickler")):
   override val redirectOutput = true
   @Test def i23408: Unit = initially:
     run("""
diff --git a/sbt-test/tasty-compat/add-param-unroll/build.sbt b/sbt-test/tasty-compat/add-param-unroll/build.sbt
@@ -1,5 +1,5 @@
 lazy val commonSettings = Seq(
-  scalacOptions += "-experimental",
+  scalacOptions += "-preview",
 )
 
 lazy val printSettings = Seq(
diff --git a/tests/neg/unroll-abstractMethod.scala b/tests/neg/unroll-abstractMethod.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 
 import scala.annotation.unroll
 
diff --git a/tests/neg/unroll-clash.scala b/tests/neg/unroll-clash.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 
 import scala.annotation.unroll
 
diff --git a/tests/neg/unroll-clause-interleaving.scala b/tests/neg/unroll-clause-interleaving.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 
 import scala.annotation.unroll
 
diff --git a/tests/neg/unroll-duped.scala b/tests/neg/unroll-duped.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 
 import scala.annotation.unroll
 
diff --git a/tests/neg/unroll-illegal.scala b/tests/neg/unroll-illegal.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 
 import scala.annotation.unroll
 
diff --git a/tests/neg/unroll-illegal2.scala b/tests/neg/unroll-illegal2.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 
 import scala.annotation.unroll
 
diff --git a/tests/neg/unroll-illegal3.scala b/tests/neg/unroll-illegal3.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 
 import scala.annotation.unroll
 
diff --git a/tests/neg/unroll-multipleParams.scala b/tests/neg/unroll-multipleParams.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 
 import scala.annotation.unroll
 
diff --git a/tests/neg/unroll-no-default.scala b/tests/neg/unroll-no-default.scala
@@ -1,4 +1,4 @@
-//> using options -experimental -Vprint:unrollDefs
+//> using options -preview -Vprint:unrollDefs
 
 import scala.annotation.unroll
 
diff --git a/tests/neg/unroll-traitConstructor.scala b/tests/neg/unroll-traitConstructor.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 
 import scala.annotation.unroll
 
diff --git a/tests/pos/i22833-unroll-final-class.scala b/tests/pos/i22833-unroll-final-class.scala
@@ -1,5 +1,6 @@
-import scala.annotation.{experimental,unroll}
+//> using options -preview
+import scala.annotation.unroll
 
-@experimental final class Foo {
+final class Foo {
   def bar(@unroll x: Int = 0) = x + 1
-}
+}
diff --git a/tests/run-tasty-inspector/stdlibExperimentalDefinitions.scala b/tests/run-tasty-inspector/stdlibExperimentalDefinitions.scala
@@ -93,9 +93,6 @@ val experimentalDefinitionInLibrary = Set(
   // Need quotedPatternsWithPolymorphicFunctions enabled.
   "scala.quoted.runtime.Patterns$.higherOrderHoleWithTypes",
 
-  // New feature: SIP 61 - @unroll annotation
-  "scala.annotation.unroll",
-
   // New feature: Erased trait
   "scala.compiletime.Erased",
 )
diff --git a/tests/run/unroll-caseclass-integration/Unrolled_2.scala b/tests/run/unroll-caseclass-integration/Unrolled_2.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 package unroll
 
 import scala.annotation.unroll
diff --git a/tests/run/unroll-caseclass-integration/Unrolled_3.scala b/tests/run/unroll-caseclass-integration/Unrolled_3.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 package unroll
 
 import scala.annotation.unroll
diff --git a/tests/run/unroll-classMethod-integration/Unrolled_2.scala b/tests/run/unroll-classMethod-integration/Unrolled_2.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 package unroll
 
 import scala.annotation.unroll
diff --git a/tests/run/unroll-classMethod-integration/Unrolled_3.scala b/tests/run/unroll-classMethod-integration/Unrolled_3.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 package unroll
 
 import scala.annotation.unroll
diff --git a/tests/run/unroll-clause-interleaving/Unrolled_2.scala b/tests/run/unroll-clause-interleaving/Unrolled_2.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 
 import scala.annotation.unroll
 
diff --git a/tests/run/unroll-clause-interleaving/Unrolled_3.scala b/tests/run/unroll-clause-interleaving/Unrolled_3.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 
 import scala.annotation.unroll
 
diff --git a/tests/run/unroll-curriedMethod-integration/Unrolled_2.scala b/tests/run/unroll-curriedMethod-integration/Unrolled_2.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 package unroll
 
 import scala.annotation.unroll
diff --git a/tests/run/unroll-curriedMethod-integration/Unrolled_3.scala b/tests/run/unroll-curriedMethod-integration/Unrolled_3.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 package unroll
 
 import scala.annotation.unroll
diff --git a/tests/run/unroll-genericMethod-integration/Unrolled_2.scala b/tests/run/unroll-genericMethod-integration/Unrolled_2.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 package unroll
 
 import scala.annotation.unroll
diff --git a/tests/run/unroll-genericMethod-integration/Unrolled_3.scala b/tests/run/unroll-genericMethod-integration/Unrolled_3.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 package unroll
 
 import scala.annotation.unroll
diff --git a/tests/run/unroll-inferredFinal.scala b/tests/run/unroll-inferredFinal.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 
 import scala.annotation.unroll
 
diff --git a/tests/run/unroll-methodWithImplicit-integration/Unrolled_2.scala b/tests/run/unroll-methodWithImplicit-integration/Unrolled_2.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 package unroll
 
 import scala.annotation.unroll
diff --git a/tests/run/unroll-methodWithImplicit-integration/Unrolled_3.scala b/tests/run/unroll-methodWithImplicit-integration/Unrolled_3.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 package unroll
 
 import scala.annotation.unroll
diff --git a/tests/run/unroll-multiple.scala b/tests/run/unroll-multiple.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 
 import scala.annotation.unroll
 import scala.deriving.Mirror
diff --git a/tests/run/unroll-objectMethod-integration/Unrolled_2.scala b/tests/run/unroll-objectMethod-integration/Unrolled_2.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 package unroll
 
 import scala.annotation.unroll
diff --git a/tests/run/unroll-objectMethod-integration/Unrolled_3.scala b/tests/run/unroll-objectMethod-integration/Unrolled_3.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 package unroll
 
 import scala.annotation.unroll
diff --git a/tests/run/unroll-primaryConstructor-integration/Unrolled_2.scala b/tests/run/unroll-primaryConstructor-integration/Unrolled_2.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 package unroll
 
 import scala.annotation.unroll
diff --git a/tests/run/unroll-primaryConstructor-integration/Unrolled_3.scala b/tests/run/unroll-primaryConstructor-integration/Unrolled_3.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 package unroll
 
 import scala.annotation.unroll
diff --git a/tests/run/unroll-secondParameterList-integration/Unrolled_2.scala b/tests/run/unroll-secondParameterList-integration/Unrolled_2.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 package unroll
 
 import scala.annotation.unroll
diff --git a/tests/run/unroll-secondParameterList-integration/Unrolled_3.scala b/tests/run/unroll-secondParameterList-integration/Unrolled_3.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 package unroll
 
 import scala.annotation.unroll
diff --git a/tests/run/unroll-secondaryConstructor-integration/Unrolled_2.scala b/tests/run/unroll-secondaryConstructor-integration/Unrolled_2.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 package unroll
 
 import scala.annotation.unroll
diff --git a/tests/run/unroll-secondaryConstructor-integration/Unrolled_3.scala b/tests/run/unroll-secondaryConstructor-integration/Unrolled_3.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 package unroll
 
 import scala.annotation.unroll
diff --git a/tests/run/unroll-traitMethod-integration/Unrolled_2.scala b/tests/run/unroll-traitMethod-integration/Unrolled_2.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 package unroll
 
 import scala.annotation.unroll
diff --git a/tests/run/unroll-traitMethod-integration/Unrolled_3.scala b/tests/run/unroll-traitMethod-integration/Unrolled_3.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 package unroll
 
 import scala.annotation.unroll
diff --git a/tests/run/unroll-value-class/Unrolled_2.scala b/tests/run/unroll-value-class/Unrolled_2.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 
 import scala.annotation.unroll
 
diff --git a/tests/run/unroll-value-class/Unrolled_3.scala b/tests/run/unroll-value-class/Unrolled_3.scala
@@ -1,4 +1,4 @@
-//> using options -experimental
+//> using options -preview
 
 import scala.annotation.unroll
 

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`package scala.annotation`
`2`	`2`
`3`	`3`	`import language.experimental.captureChecking`
	`4`	`+import scala.annotation.internal.preview`
`4`	`5`
`5`		`-@experimental("under review as part of SIP-61")`
	`6`	`+@preview`
`6`	`7`	/**The `@unroll` annotation is reserved for parameters of classes and methods.
`7`	`8`	`*`
`8`	`9`	`* It enables to add new parameters while preserving backwards binary compatibility,`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`lazy val commonSettings = Seq(`
`2`		`- scalacOptions += "-experimental",`
	`2`	`+ scalacOptions += "-preview",`
`3`	`3`	`)`
`4`	`4`
`5`	`5`	`lazy val printSettings = Seq(`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//> using options -experimental`
	`1`	`+//> using options -preview`
`2`	`2`
`3`	`3`	`import scala.annotation.unroll`
`4`	`4`