Rename scala.compiletime.ErasedFunction => scala.runtime.ErasedFunction

scala · Feb 27, 2023 · 3fa0423 · 3fa0423
1 parent 41db4f5
commit 3fa0423
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/compiler/src/dotty/tools/dotc/core/Definitions.scala b/compiler/src/dotty/tools/dotc/core/Definitions.scala
@@ -1459,7 +1459,7 @@ class Definitions {
   lazy val PolyFunctionClass = requiredClass("scala.PolyFunction")
   def PolyFunctionType = PolyFunctionClass.typeRef
 
-  lazy val ErasedFunctionClass = requiredClass("scala.compiletime.ErasedFunction")
+  lazy val ErasedFunctionClass = requiredClass("scala.runtime.ErasedFunction")
 
   /** If `cls` is a class in the scala package, its name, otherwise EmptyTypeName */
   def scalaClassName(cls: Symbol)(using Context): TypeName = cls.denot match

diff --git a/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala b/compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
@@ -2776,7 +2776,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
       def FunctionClass(arity: Int, isImplicit: Boolean = false, isErased: Boolean = false): Symbol =
         if arity < 0 then throw IllegalArgumentException(s"arity: $arity")
         if isErased then
-          throw new Exception("Erased function classes are not supported. Use a refined `ErasedFunctionClass`")
+          throw new Exception("Erased function classes are not supported. Use a refined `scala.runtime.ErasedFunction`")
         else dotc.core.Symbols.defn.FunctionSymbol(arity, isImplicit)
       def FunctionClass(arity: Int): Symbol =
         FunctionClass(arity, false, false)

diff --git a/library/src/scala/quoted/Quotes.scala b/library/src/scala/quoted/Quotes.scala
@@ -4294,7 +4294,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
       @experimental
       def FunctionClass(arity: Int, isContextual: Boolean): Symbol
 
-      /** The `ErasedFunction` built-in trait. */
+      /** The `scala.runtime.ErasedFunction` built-in trait. */
       @experimental
       def ErasedFunctionClass: Symbol
 

diff --git a/...rc/scala/compiletime/ErasedFunction.scala → ...ry/src/scala/runtime/ErasedFunction.scala b/...rc/scala/compiletime/ErasedFunction.scala → ...ry/src/scala/runtime/ErasedFunction.scala
@@ -1,4 +1,4 @@
-package scala.compiletime
+package scala.runtime
 
 import scala.annotation.experimental
 

diff --git a/tests/run-custom-args/erased/erased-15.scala b/tests/run-custom-args/erased/erased-15.scala
@@ -1,4 +1,4 @@
-import scala.compiletime.ErasedFunction
+import scala.runtime.ErasedFunction
 
 object Test {
 

diff --git a/tests/run-custom-args/tasty-inspector/stdlibExperimentalDefinitions.scala b/tests/run-custom-args/tasty-inspector/stdlibExperimentalDefinitions.scala
@@ -81,16 +81,15 @@ val experimentalDefinitionInLibrary = Set(
   "scala.quoted.Quotes.reflectModule.SymbolModule.newModule",
   "scala.quoted.Quotes.reflectModule.SymbolModule.freshName",
   "scala.quoted.Quotes.reflectModule.SymbolMethods.info",
-  // Quotes for functions with erased parameters.
+
+  // New feature: functions with erased parameters.
+  // Need erasedDefinitions enabled.
+  "scala.runtime.ErasedFunction",
   "scala.quoted.Quotes.reflectModule.MethodTypeMethods.erasedParams",
   "scala.quoted.Quotes.reflectModule.MethodTypeMethods.hasErasedParams",
   "scala.quoted.Quotes.reflectModule.TermParamClauseMethods.erasedArgs",
   "scala.quoted.Quotes.reflectModule.TermParamClauseMethods.hasErasedArgs",
-  "scala.quoted.Quotes.reflectModule.defnModule.ErasedFunctionClass",
-
-  // New feature: functions with erased parameters.
-  // Need erasedDefinitions enabled.
-  "scala.compiletime.ErasedFunction"
+  "scala.quoted.Quotes.reflectModule.defnModule.ErasedFunctionClass"
 )