Skip to content

Commit 3fa0423

Browse files
committed
Rename scala.compiletime.ErasedFunction => scala.runtime.ErasedFunction
1 parent 41db4f5 commit 3fa0423

File tree

6 files changed

+10
-11
lines changed

6 files changed

+10
-11
lines changed

compiler/src/dotty/tools/dotc/core/Definitions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1459,7 +1459,7 @@ class Definitions {
14591459
lazy val PolyFunctionClass = requiredClass("scala.PolyFunction")
14601460
def PolyFunctionType = PolyFunctionClass.typeRef
14611461

1462-
lazy val ErasedFunctionClass = requiredClass("scala.compiletime.ErasedFunction")
1462+
lazy val ErasedFunctionClass = requiredClass("scala.runtime.ErasedFunction")
14631463

14641464
/** If `cls` is a class in the scala package, its name, otherwise EmptyTypeName */
14651465
def scalaClassName(cls: Symbol)(using Context): TypeName = cls.denot match

compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2776,7 +2776,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
27762776
def FunctionClass(arity: Int, isImplicit: Boolean = false, isErased: Boolean = false): Symbol =
27772777
if arity < 0 then throw IllegalArgumentException(s"arity: $arity")
27782778
if isErased then
2779-
throw new Exception("Erased function classes are not supported. Use a refined `ErasedFunctionClass`")
2779+
throw new Exception("Erased function classes are not supported. Use a refined `scala.runtime.ErasedFunction`")
27802780
else dotc.core.Symbols.defn.FunctionSymbol(arity, isImplicit)
27812781
def FunctionClass(arity: Int): Symbol =
27822782
FunctionClass(arity, false, false)

library/src/scala/quoted/Quotes.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4294,7 +4294,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
42944294
@experimental
42954295
def FunctionClass(arity: Int, isContextual: Boolean): Symbol
42964296

4297-
/** The `ErasedFunction` built-in trait. */
4297+
/** The `scala.runtime.ErasedFunction` built-in trait. */
42984298
@experimental
42994299
def ErasedFunctionClass: Symbol
43004300

library/src/scala/compiletime/ErasedFunction.scala renamed to library/src/scala/runtime/ErasedFunction.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package scala.compiletime
1+
package scala.runtime
22

33
import scala.annotation.experimental
44

tests/run-custom-args/erased/erased-15.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import scala.compiletime.ErasedFunction
1+
import scala.runtime.ErasedFunction
22

33
object Test {
44

tests/run-custom-args/tasty-inspector/stdlibExperimentalDefinitions.scala

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,15 @@ val experimentalDefinitionInLibrary = Set(
8181
"scala.quoted.Quotes.reflectModule.SymbolModule.newModule",
8282
"scala.quoted.Quotes.reflectModule.SymbolModule.freshName",
8383
"scala.quoted.Quotes.reflectModule.SymbolMethods.info",
84-
// Quotes for functions with erased parameters.
84+
85+
// New feature: functions with erased parameters.
86+
// Need erasedDefinitions enabled.
87+
"scala.runtime.ErasedFunction",
8588
"scala.quoted.Quotes.reflectModule.MethodTypeMethods.erasedParams",
8689
"scala.quoted.Quotes.reflectModule.MethodTypeMethods.hasErasedParams",
8790
"scala.quoted.Quotes.reflectModule.TermParamClauseMethods.erasedArgs",
8891
"scala.quoted.Quotes.reflectModule.TermParamClauseMethods.hasErasedArgs",
89-
"scala.quoted.Quotes.reflectModule.defnModule.ErasedFunctionClass",
90-
91-
// New feature: functions with erased parameters.
92-
// Need erasedDefinitions enabled.
93-
"scala.compiletime.ErasedFunction"
92+
"scala.quoted.Quotes.reflectModule.defnModule.ErasedFunctionClass"
9493
)
9594

9695

0 commit comments

Comments
 (0)