From 050c89477fcc8dfebe07e230fc888588f0ea3727 Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Mon, 12 Feb 2024 11:05:23 +0800
Subject: [PATCH] unroll.Unroll -> scala.annotation.unroll

---
 README.md                                     | 54 +++++++++----------
 build.sc                                      |  6 +--
 unroll/annotation/src/Unroll.scala            |  4 +-
 unroll/plugin/src-2/UnrollPhaseScala2.scala   |  2 +-
 unroll/plugin/src-3/UnrollPhaseScala3.scala   |  3 +-
 .../abstractClassMethod/v1/src/Unrolled.scala |  2 +-
 .../abstractClassMethod/v2/src/Unrolled.scala |  4 +-
 .../abstractClassMethod/v3/src/Unrolled.scala |  4 +-
 .../abstractTraitMethod/v2/src/Unrolled.scala |  4 +-
 .../abstractTraitMethod/v3/src/Unrolled.scala |  4 +-
 unroll/tests/caseclass/v2/src/Unrolled.scala  |  4 +-
 unroll/tests/caseclass/v3/src/Unrolled.scala  |  4 +-
 .../tests/classMethod/v2/src/Unrolled.scala   |  4 +-
 .../tests/classMethod/v3/src/Unrolled.scala   |  4 +-
 .../tests/curriedMethod/v2/src/Unrolled.scala |  4 +-
 .../tests/curriedMethod/v3/src/Unrolled.scala |  4 +-
 .../tests/genericMethod/v2/src/Unrolled.scala |  4 +-
 .../tests/genericMethod/v3/src/Unrolled.scala |  4 +-
 .../methodWithImplicit/v2/src/Unrolled.scala  |  4 +-
 .../methodWithImplicit/v3/src/Unrolled.scala  |  4 +-
 .../tests/objectMethod/v2/src/Unrolled.scala  |  4 +-
 .../tests/objectMethod/v3/src/Unrolled.scala  |  4 +-
 .../primaryConstructor/v2/src/Unrolled.scala  |  4 +-
 .../primaryConstructor/v3/src/Unrolled.scala  |  4 +-
 .../v2/src/Unrolled.scala                     |  4 +-
 .../v3/src/Unrolled.scala                     |  4 +-
 .../tests/traitMethod/v2/src/Unrolled.scala   |  4 +-
 .../tests/traitMethod/v3/src/Unrolled.scala   |  5 +-
 28 files changed, 102 insertions(+), 58 deletions(-)

diff --git a/README.md b/README.md
index 5da497d..a0da5e6 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
-# @Unroll
+# @unroll
 
 
-Unroll provides an experimental `@Unroll` annotation that can be applied to methods, classes, 
-and constructors. `@Unroll` generates unrolled/telescoping versions of the method, starting
+Unroll provides an experimental `@unroll` annotation that can be applied to methods, classes, 
+and constructors. `@unroll` generates unrolled/telescoping versions of the method, starting
 from the annotated parameter, which are simple forwarders to the primary method or 
 constructor implementation. This allows you to maintain binary compatibility when adding
 a new default parameter, without the boilerplate of manually defining forwarder methods.
 
-See the following PRs that demonstrate the usage of `@Unroll` and the binary-compatibility
+See the following PRs that demonstrate the usage of `@unroll` and the binary-compatibility
 boilerplate that can be saved:
 
 - https://github.com/com-lihaoyi/mainargs/pull/113/files
@@ -26,9 +26,9 @@ it has a default value, all your users would have to recompile all their code. A
 *their* users would need to re-compile all their code, transitively. And so library
 maintainers would suffer so their users could have a smooth upgrading experience.
 
-With `@Unroll`, none of this is a problem anymore. You can add new parameters
+With `@unroll`, none of this is a problem anymore. You can add new parameters
 where-ever you like: method `def`s, `class`es, `case class`es, etc. As long as the
-new parameter has a default value, you can `@Unroll` it to generate the binary-compatibility
+new parameter has a default value, you can `@unroll` it to generate the binary-compatibility
 stub forwarder method automatically. Happy library maintainers, happy users, everyone is happy!
 
 See this original discussion for more context:
@@ -40,20 +40,20 @@ See this original discussion for more context:
 ### Methods
 
 ```scala
-import unroll.Unroll
+import scala.annotation.unroll
 
 object Unrolled{
-   def foo(s: String, n: Int = 1, @Unroll b: Boolean = true, l: Long = 0) = s + n + b + l
+   def foo(s: String, n: Int = 1, @unroll b: Boolean = true, l: Long = 0) = s + n + b + l
 }
 ```
 
 Unrolls to:
 
 ```scala
-import unroll.Unroll
+import scala.annotation.unroll
 
 object Unrolled{
-   def foo(s: String, n: Int = 1, @Unroll b: Boolean = true, l: Long = 0) = s + n + b + l
+   def foo(s: String, n: Int = 1, @unroll b: Boolean = true, l: Long = 0) = s + n + b + l
 
    def foo(s: String, n: Int, b: Boolean) = foo(s, n, b, 0)
    def foo(s: String, n: Int) = foo(s, n, true, 0)
@@ -62,9 +62,9 @@ object Unrolled{
 ### Classes
 
 ```scala
-import unroll.Unroll
+import scala.annotation.unroll
 
-class Unrolled(s: String, n: Int = 1, @Unroll b: Boolean = true, l: Long = 0){
+class Unrolled(s: String, n: Int = 1, @unroll b: Boolean = true, l: Long = 0){
    def foo = s + n + b + l
 }
 ```
@@ -72,9 +72,9 @@ class Unrolled(s: String, n: Int = 1, @Unroll b: Boolean = true, l: Long = 0){
 Unrolls to:
 
 ```scala
-import unroll.Unroll
+import scala.annotation.unroll
 
-class Unrolled(s: String, n: Int = 1, @Unroll b: Boolean = true, l: Long = 0){
+class Unrolled(s: String, n: Int = 1, @unroll b: Boolean = true, l: Long = 0){
    def foo = s + n + b + l
 
    def this(s: String, n: Int, b: Boolean) = this(s, n, b, 0)
@@ -85,12 +85,12 @@ class Unrolled(s: String, n: Int = 1, @Unroll b: Boolean = true, l: Long = 0){
 ### Constructors
 
 ```scala
-import unroll.Unroll
+import scala.annotation.unroll
 
 class Unrolled() {
    var foo = ""
 
-   def this(s: String, n: Int = 1, @Unroll b: Boolean = true, l: Long = 0) = {
+   def this(s: String, n: Int = 1, @unroll b: Boolean = true, l: Long = 0) = {
       this()
       foo = s + n + b + l
    }
@@ -100,12 +100,12 @@ class Unrolled() {
 Unrolls to:
 
 ```scala
-import unroll.Unroll
+import scala.annotation.unroll
 
 class Unrolled() {
    var foo = ""
 
-   def this(s: String, n: Int = 1, @Unroll b: Boolean = true, l: Long = 0) = {
+   def this(s: String, n: Int = 1, @unroll b: Boolean = true, l: Long = 0) = {
       this()
       foo = s + n + b + l
    }
@@ -118,9 +118,9 @@ class Unrolled() {
 ### Case Classes
 
 ```scala
-import unroll.Unroll
+import scala.annotation.unroll
 
-case class Unrolled(s: String, n: Int = 1, @Unroll b: Boolean = true){
+case class Unrolled(s: String, n: Int = 1, @unroll b: Boolean = true){
   def foo = s + n + b
 }
 ```
@@ -128,9 +128,9 @@ case class Unrolled(s: String, n: Int = 1, @Unroll b: Boolean = true){
 Unrolls to:
 
 ```scala
-import unroll.Unroll
+import scala.annotation.unroll
 
-case class Unrolled(s: String, n: Int = 1, @Unroll b: Boolean = true, l: Long = 0L){
+case class Unrolled(s: String, n: Int = 1, @unroll b: Boolean = true, l: Long = 0L){
    def this(s: String, n: Int) = this(s, n, true, 0L)
    def this(s: String, n: Int, b: Boolean) = this(s, n, b, 0L)
    
@@ -148,10 +148,10 @@ object Unrolled{
 ### Abstract Methods
 
 ```scala
-import unroll.Unroll
+import scala.annotation.unroll
 
 trait Unrolled{
-  def foo(s: String, n: Int = 1, @Unroll b: Boolean = true): String
+  def foo(s: String, n: Int = 1, @unroll b: Boolean = true): String
 }
 
 object Unrolled extends Unrolled{
@@ -163,7 +163,7 @@ Unrolls to:
 
 ```scala
 trait Unrolled{
-  def foo(s: String, n: Int = 1, @Unroll b: Boolean = true): String
+  def foo(s: String, n: Int = 1, @unroll b: Boolean = true): String
   def foo(s: String, n: Int = 1): String = foo(s, n, true)
 }
 
@@ -172,9 +172,9 @@ object Unrolled extends Unrolled{
 }
 ```
 
-Note that only the abstract method needs to be `@Unroll`ed, as the generated forwarder
+Note that only the abstract method needs to be `@unroll`ed, as the generated forwarder
 methods are concrete. The concrete implementation `class` or `object` does not need to 
-`@Unroll` its implementation method, as it only needs to implement the abstract `@Unroll`ed
+`@unroll` its implementation method, as it only needs to implement the abstract `@unroll`ed
 method and not the concrete forwarders.
 
 ## Limitations
diff --git a/build.sc b/build.sc
index d60afe1..4698cec 100644
--- a/build.sc
+++ b/build.sc
@@ -146,15 +146,15 @@ trait UnrollModule extends Cross.Module[String]{
       }
 
       object jvm extends InnerScalaModule with ComparativePlatformScalaModule{
-        def unmanagedClasspath = Agg(upstreamTest.jvm.test.jar(), upstream.jvm.jar())
+        def unmanagedClasspath = Agg(upstreamTest.jvm.test.compile().classes, upstream.jvm.compile().classes)
       }
 
       object js extends InnerScalaJsModule with ComparativePlatformScalaModule{
-        def unmanagedClasspath = Agg(upstreamTest.js.test.jar(), upstream.js.jar())
+        def unmanagedClasspath = Agg(upstreamTest.js.test.compile().classes, upstream.js.compile().classes)
       }
 
       object native extends InnerScalaNativeModule with ComparativePlatformScalaModule{
-        def unmanagedClasspath = Agg(upstreamTest.native.test.jar(), upstream.native.jar())
+        def unmanagedClasspath = Agg(upstreamTest.native.test.compile().classes, upstream.native.compile().classes)
       }
     }
 
diff --git a/unroll/annotation/src/Unroll.scala b/unroll/annotation/src/Unroll.scala
index 695948d..69d1ddb 100644
--- a/unroll/annotation/src/Unroll.scala
+++ b/unroll/annotation/src/Unroll.scala
@@ -1,3 +1,3 @@
-package unroll
+package scala.annotation
 
-class Unroll extends scala.annotation.StaticAnnotation
+class unroll extends scala.annotation.StaticAnnotation
diff --git a/unroll/plugin/src-2/UnrollPhaseScala2.scala b/unroll/plugin/src-2/UnrollPhaseScala2.scala
index 815957f..4bd8b02 100644
--- a/unroll/plugin/src-2/UnrollPhaseScala2.scala
+++ b/unroll/plugin/src-2/UnrollPhaseScala2.scala
@@ -20,7 +20,7 @@ class UnrollPhaseScala2(val global: Global) extends PluginComponent with TypingT
   }
 
   def findUnrollAnnotation(params: Seq[Symbol]): Int = {
-    params.toList.indexWhere(_.annotations.exists(_.tpe =:= typeOf[unroll.Unroll]))
+    params.toList.indexWhere(_.annotations.exists(_.tpe =:= typeOf[scala.annotation.unroll]))
   }
 
   def copyValDef(vd: ValDef) = {
diff --git a/unroll/plugin/src-3/UnrollPhaseScala3.scala b/unroll/plugin/src-3/UnrollPhaseScala3.scala
index aa20bbe..b487c5e 100644
--- a/unroll/plugin/src-3/UnrollPhaseScala3.scala
+++ b/unroll/plugin/src-3/UnrollPhaseScala3.scala
@@ -172,7 +172,7 @@ class UnrollPhaseScala3() extends PluginPhase {
         val paramCount = annotated.paramSymss(firstValueParamClauseIndex).size
         annotated
           .paramSymss(firstValueParamClauseIndex)
-          .indexWhere(_.annotations.exists(_.symbol.fullName.toString == "unroll.Unroll")) match{
+          .indexWhere(_.annotations.exists(_.symbol.fullName.toString == "scala.annotation.unroll")) match{
           case -1 => (None, Nil)
           case startParamIndex =>
             if (isCaseFromProduct) {
@@ -202,6 +202,7 @@ class UnrollPhaseScala3() extends PluginPhase {
     val (removed0, generatedDefs) = tmpl.body.map(generateSyntheticDefs).unzip
     val (None, generatedConstr) = generateSyntheticDefs(tmpl.constr)
     val removed = removed0.flatten
+
     super.transformTemplate(
       cpy.Template(tmpl)(
         tmpl.constr,
diff --git a/unroll/tests/abstractClassMethod/v1/src/Unrolled.scala b/unroll/tests/abstractClassMethod/v1/src/Unrolled.scala
index 5285557..185cd83 100644
--- a/unroll/tests/abstractClassMethod/v1/src/Unrolled.scala
+++ b/unroll/tests/abstractClassMethod/v1/src/Unrolled.scala
@@ -10,4 +10,4 @@ object Unrolled extends Unrolled{
 
 class UnrolledCls extends Unrolled{
   def foo(s: String, n: Int = 1) = s + n
-}
\ No newline at end of file
+}
diff --git a/unroll/tests/abstractClassMethod/v2/src/Unrolled.scala b/unroll/tests/abstractClassMethod/v2/src/Unrolled.scala
index 8298bae..a474e0d 100644
--- a/unroll/tests/abstractClassMethod/v2/src/Unrolled.scala
+++ b/unroll/tests/abstractClassMethod/v2/src/Unrolled.scala
@@ -1,7 +1,9 @@
 package unroll
 
+import scala.annotation.unroll
+
 abstract class Unrolled{
-  def foo(s: String, n: Int = 1, @Unroll b: Boolean = true): String
+  def foo(s: String, n: Int = 1, @unroll b: Boolean = true): String
 }
 
 object Unrolled extends Unrolled{
diff --git a/unroll/tests/abstractClassMethod/v3/src/Unrolled.scala b/unroll/tests/abstractClassMethod/v3/src/Unrolled.scala
index f1e3940..ad8ab88 100644
--- a/unroll/tests/abstractClassMethod/v3/src/Unrolled.scala
+++ b/unroll/tests/abstractClassMethod/v3/src/Unrolled.scala
@@ -1,7 +1,9 @@
 package unroll
 
+import scala.annotation.unroll
+
 abstract class Unrolled{
-  def foo(s: String, n: Int = 1, @Unroll b: Boolean = true, l: Long = 0): String
+  def foo(s: String, n: Int = 1, @unroll b: Boolean = true, l: Long = 0): String
 }
 
 object Unrolled extends Unrolled{
diff --git a/unroll/tests/abstractTraitMethod/v2/src/Unrolled.scala b/unroll/tests/abstractTraitMethod/v2/src/Unrolled.scala
index e609f01..83b1f32 100644
--- a/unroll/tests/abstractTraitMethod/v2/src/Unrolled.scala
+++ b/unroll/tests/abstractTraitMethod/v2/src/Unrolled.scala
@@ -1,7 +1,9 @@
 package unroll
 
+import scala.annotation.unroll
+
 trait Unrolled{
-  def foo(s: String, n: Int = 1, @Unroll b: Boolean = true): String
+  def foo(s: String, n: Int = 1, @unroll b: Boolean = true): String
 }
 
 object Unrolled extends Unrolled{
diff --git a/unroll/tests/abstractTraitMethod/v3/src/Unrolled.scala b/unroll/tests/abstractTraitMethod/v3/src/Unrolled.scala
index 661fe8c..6ae24bb 100644
--- a/unroll/tests/abstractTraitMethod/v3/src/Unrolled.scala
+++ b/unroll/tests/abstractTraitMethod/v3/src/Unrolled.scala
@@ -1,7 +1,9 @@
 package unroll
 
+import scala.annotation.unroll
+
 trait Unrolled{
-  def foo(s: String, n: Int = 1, @Unroll b: Boolean = true, l: Long = 0): String
+  def foo(s: String, n: Int = 1, @unroll b: Boolean = true, l: Long = 0): String
 }
 
 object Unrolled extends Unrolled{
diff --git a/unroll/tests/caseclass/v2/src/Unrolled.scala b/unroll/tests/caseclass/v2/src/Unrolled.scala
index 1ed2376..916c445 100644
--- a/unroll/tests/caseclass/v2/src/Unrolled.scala
+++ b/unroll/tests/caseclass/v2/src/Unrolled.scala
@@ -1,5 +1,7 @@
 package unroll
 
-case class Unrolled(s: String, n: Int = 1, @Unroll b: Boolean = true){
+import scala.annotation.unroll
+
+case class Unrolled(s: String, n: Int = 1, @unroll b: Boolean = true){
   def foo = s + n + b
 }
diff --git a/unroll/tests/caseclass/v3/src/Unrolled.scala b/unroll/tests/caseclass/v3/src/Unrolled.scala
index 70998c4..be6a77d 100644
--- a/unroll/tests/caseclass/v3/src/Unrolled.scala
+++ b/unroll/tests/caseclass/v3/src/Unrolled.scala
@@ -1,5 +1,7 @@
 package unroll
 
-case class Unrolled(s: String, n: Int = 1, @Unroll b: Boolean = true, l: Long = 0){
+import scala.annotation.unroll
+
+case class Unrolled(s: String, n: Int = 1, @unroll b: Boolean = true, l: Long = 0){
   def foo = s + n + b + l
 }
diff --git a/unroll/tests/classMethod/v2/src/Unrolled.scala b/unroll/tests/classMethod/v2/src/Unrolled.scala
index 1f37888..bd450cf 100644
--- a/unroll/tests/classMethod/v2/src/Unrolled.scala
+++ b/unroll/tests/classMethod/v2/src/Unrolled.scala
@@ -1,6 +1,8 @@
 package unroll
 
+import scala.annotation.unroll
+
 class Unrolled{
-  def foo(s: String, @Unroll n: Int = 1, b: Boolean = true) = s + n + b
+  def foo(s: String, @unroll n: Int = 1, b: Boolean = true) = s + n + b
 }
 
diff --git a/unroll/tests/classMethod/v3/src/Unrolled.scala b/unroll/tests/classMethod/v3/src/Unrolled.scala
index d62b694..429c911 100644
--- a/unroll/tests/classMethod/v3/src/Unrolled.scala
+++ b/unroll/tests/classMethod/v3/src/Unrolled.scala
@@ -1,7 +1,9 @@
 package unroll
 
+import scala.annotation.unroll
+
 class Unrolled{
-  def foo(s: String, @Unroll n: Int = 1, b: Boolean = true, l: Long = 0) = s + n + b + l
+  def foo(s: String, @unroll n: Int = 1, b: Boolean = true, l: Long = 0) = s + n + b + l
 }
 
 
diff --git a/unroll/tests/curriedMethod/v2/src/Unrolled.scala b/unroll/tests/curriedMethod/v2/src/Unrolled.scala
index f6d6428..843dbaa 100644
--- a/unroll/tests/curriedMethod/v2/src/Unrolled.scala
+++ b/unroll/tests/curriedMethod/v2/src/Unrolled.scala
@@ -1,5 +1,7 @@
 package unroll
 
+import scala.annotation.unroll
+
 class Unrolled{
-  def foo(s: String, @Unroll n: Int = 1, b: Boolean = true)(f: String => String) = f(s + n + b)
+  def foo(s: String, @unroll n: Int = 1, b: Boolean = true)(f: String => String) = f(s + n + b)
 }
diff --git a/unroll/tests/curriedMethod/v3/src/Unrolled.scala b/unroll/tests/curriedMethod/v3/src/Unrolled.scala
index 8173923..2721273 100644
--- a/unroll/tests/curriedMethod/v3/src/Unrolled.scala
+++ b/unroll/tests/curriedMethod/v3/src/Unrolled.scala
@@ -1,7 +1,9 @@
 package unroll
 
+import scala.annotation.unroll
+
 class Unrolled{
-  def foo(s: String, @Unroll n: Int = 1, b: Boolean = true, l: Long = 0)(f: String => String) = f(s + n + b + l)
+  def foo(s: String, @unroll n: Int = 1, b: Boolean = true, l: Long = 0)(f: String => String) = f(s + n + b + l)
 }
 
 
diff --git a/unroll/tests/genericMethod/v2/src/Unrolled.scala b/unroll/tests/genericMethod/v2/src/Unrolled.scala
index cf1c0da..04b5679 100644
--- a/unroll/tests/genericMethod/v2/src/Unrolled.scala
+++ b/unroll/tests/genericMethod/v2/src/Unrolled.scala
@@ -1,6 +1,8 @@
 package unroll
 
+import scala.annotation.unroll
+
 class Unrolled{
-  def foo[T](s: T, @Unroll n: Int = 1, b: Boolean = true) = s.toString + n + b
+  def foo[T](s: T, @unroll n: Int = 1, b: Boolean = true) = s.toString + n + b
 }
 
diff --git a/unroll/tests/genericMethod/v3/src/Unrolled.scala b/unroll/tests/genericMethod/v3/src/Unrolled.scala
index 5486816..e505a74 100644
--- a/unroll/tests/genericMethod/v3/src/Unrolled.scala
+++ b/unroll/tests/genericMethod/v3/src/Unrolled.scala
@@ -1,7 +1,9 @@
 package unroll
 
+import scala.annotation.unroll
+
 class Unrolled{
-  def foo[T](s: T, @Unroll n: Int = 1, b: Boolean = true, l: Long = 0) = s.toString + n + b + l
+  def foo[T](s: T, @unroll n: Int = 1, b: Boolean = true, l: Long = 0) = s.toString + n + b + l
 }
 
 
diff --git a/unroll/tests/methodWithImplicit/v2/src/Unrolled.scala b/unroll/tests/methodWithImplicit/v2/src/Unrolled.scala
index a6bbe44..fa98747 100644
--- a/unroll/tests/methodWithImplicit/v2/src/Unrolled.scala
+++ b/unroll/tests/methodWithImplicit/v2/src/Unrolled.scala
@@ -1,5 +1,7 @@
 package unroll
 
+import scala.annotation.unroll
+
 class Unrolled{
-  def foo(s: String, @Unroll n: Int = 1, b: Boolean = true)(implicit f: String => String) = f(s + n + b)
+  def foo(s: String, @unroll n: Int = 1, b: Boolean = true)(implicit f: String => String) = f(s + n + b)
 }
diff --git a/unroll/tests/methodWithImplicit/v3/src/Unrolled.scala b/unroll/tests/methodWithImplicit/v3/src/Unrolled.scala
index 8da2fb3..14a20ac 100644
--- a/unroll/tests/methodWithImplicit/v3/src/Unrolled.scala
+++ b/unroll/tests/methodWithImplicit/v3/src/Unrolled.scala
@@ -1,7 +1,9 @@
 package unroll
 
+import scala.annotation.unroll
+
 class Unrolled{
-  def foo(s: String, @Unroll n: Int = 1, b: Boolean = true, l: Long = 0)(implicit f: String => String) = f(s + n + b + l)
+  def foo(s: String, @unroll n: Int = 1, b: Boolean = true, l: Long = 0)(implicit f: String => String) = f(s + n + b + l)
 }
 
 
diff --git a/unroll/tests/objectMethod/v2/src/Unrolled.scala b/unroll/tests/objectMethod/v2/src/Unrolled.scala
index 61dd2ec..ce837af 100644
--- a/unroll/tests/objectMethod/v2/src/Unrolled.scala
+++ b/unroll/tests/objectMethod/v2/src/Unrolled.scala
@@ -1,7 +1,9 @@
 package unroll
 
+import scala.annotation.unroll
+
 object Unrolled{
-  def foo(s: String, n: Int = 1, @Unroll b: Boolean = true) = s + n + b
+  def foo(s: String, n: Int = 1, @unroll b: Boolean = true) = s + n + b
 }
 
 
diff --git a/unroll/tests/objectMethod/v3/src/Unrolled.scala b/unroll/tests/objectMethod/v3/src/Unrolled.scala
index 4d427e4..b3e35c4 100644
--- a/unroll/tests/objectMethod/v3/src/Unrolled.scala
+++ b/unroll/tests/objectMethod/v3/src/Unrolled.scala
@@ -1,7 +1,9 @@
 package unroll
 
+import scala.annotation.unroll
+
 object Unrolled{
-  def foo(s: String, n: Int = 1, @Unroll b: Boolean = true, l: Long = 0) = s + n + b + l
+  def foo(s: String, n: Int = 1, @unroll b: Boolean = true, l: Long = 0) = s + n + b + l
 }
 
 
diff --git a/unroll/tests/primaryConstructor/v2/src/Unrolled.scala b/unroll/tests/primaryConstructor/v2/src/Unrolled.scala
index cdefcaf..dfe3c2f 100644
--- a/unroll/tests/primaryConstructor/v2/src/Unrolled.scala
+++ b/unroll/tests/primaryConstructor/v2/src/Unrolled.scala
@@ -1,5 +1,7 @@
 package unroll
 
-class Unrolled(s: String, n: Int = 1, @Unroll b: Boolean = true){
+import scala.annotation.unroll
+
+class Unrolled(s: String, n: Int = 1, @unroll b: Boolean = true){
   def foo = s + n + b
 }
diff --git a/unroll/tests/primaryConstructor/v3/src/Unrolled.scala b/unroll/tests/primaryConstructor/v3/src/Unrolled.scala
index 4e33b91..ee8cbca 100644
--- a/unroll/tests/primaryConstructor/v3/src/Unrolled.scala
+++ b/unroll/tests/primaryConstructor/v3/src/Unrolled.scala
@@ -1,6 +1,8 @@
 package unroll
 
-class Unrolled(s: String, n: Int = 1, @Unroll b: Boolean = true, l: Long = 0){
+import scala.annotation.unroll
+
+class Unrolled(s: String, n: Int = 1, @unroll b: Boolean = true, l: Long = 0){
   def foo = s + n + b + l
 }
 
diff --git a/unroll/tests/secondaryConstructor/v2/src/Unrolled.scala b/unroll/tests/secondaryConstructor/v2/src/Unrolled.scala
index ed0abf3..3820666 100644
--- a/unroll/tests/secondaryConstructor/v2/src/Unrolled.scala
+++ b/unroll/tests/secondaryConstructor/v2/src/Unrolled.scala
@@ -1,9 +1,11 @@
 package unroll
 
+import scala.annotation.unroll
+
 class Unrolled() {
   var foo = ""
 
-  def this(s: String, n: Int = 1, @Unroll b: Boolean = true) = {
+  def this(s: String, n: Int = 1, @unroll b: Boolean = true) = {
     this()
     foo = s + n + b
   }
diff --git a/unroll/tests/secondaryConstructor/v3/src/Unrolled.scala b/unroll/tests/secondaryConstructor/v3/src/Unrolled.scala
index 17c9ed1..7063819 100644
--- a/unroll/tests/secondaryConstructor/v3/src/Unrolled.scala
+++ b/unroll/tests/secondaryConstructor/v3/src/Unrolled.scala
@@ -1,9 +1,11 @@
 package unroll
 
+import scala.annotation.unroll
+
 class Unrolled() {
   var foo = ""
 
-  def this(s: String, n: Int = 1, @Unroll b: Boolean = true, l: Long = 0) = {
+  def this(s: String, n: Int = 1, @unroll b: Boolean = true, l: Long = 0) = {
     this()
     foo = s + n + b + l
   }
diff --git a/unroll/tests/traitMethod/v2/src/Unrolled.scala b/unroll/tests/traitMethod/v2/src/Unrolled.scala
index 0ce4bcd..7d40ff1 100644
--- a/unroll/tests/traitMethod/v2/src/Unrolled.scala
+++ b/unroll/tests/traitMethod/v2/src/Unrolled.scala
@@ -1,7 +1,9 @@
 package unroll
 
+import scala.annotation.unroll
+
 trait Unrolled{
-  def foo(s: String, n: Int = 1, @Unroll b: Boolean = true) = s + n + b
+  def foo(s: String, n: Int = 1, @unroll b: Boolean = true) = s + n + b
 }
 
 object Unrolled extends Unrolled
\ No newline at end of file
diff --git a/unroll/tests/traitMethod/v3/src/Unrolled.scala b/unroll/tests/traitMethod/v3/src/Unrolled.scala
index de2a47b..a80af93 100644
--- a/unroll/tests/traitMethod/v3/src/Unrolled.scala
+++ b/unroll/tests/traitMethod/v3/src/Unrolled.scala
@@ -1,8 +1,9 @@
 package unroll
 
+import scala.annotation.unroll
+
 trait Unrolled{
-  def foo(s: String, n: Int = 1, @Unroll b: Boolean = true, l: Long = 0) = s + n + b + l
+  def foo(s: String, n: Int = 1, @unroll b: Boolean = true, l: Long = 0) = s + n + b + l
 }
 
-
 object Unrolled extends Unrolled
\ No newline at end of file