From 3ad3acba11552e638a91889b8ff48385b624db08 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 23 Feb 2024 08:55:25 +0100 Subject: [PATCH 1/3] Update reference compiler to 3.4.0 --- project/Build.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Build.scala b/project/Build.scala index a849e37c41fd..59ba6cff9006 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -83,7 +83,7 @@ object DottyJSPlugin extends AutoPlugin { object Build { import ScaladocConfigs._ - val referenceVersion = "3.3.1" + val referenceVersion = "3.4.0" val baseVersion = "3.4.2-RC1" From aeb58367fe93cc5a1250dc53614b0e2ebd0b5502 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 23 Feb 2024 08:55:51 +0100 Subject: [PATCH 2/3] Update previous Dotty version for MiMa to 3.4.0 --- project/Build.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Build.scala b/project/Build.scala index 59ba6cff9006..ace0588e9ab3 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -101,7 +101,7 @@ object Build { * set to 3.1.3. If it is going to be 3.1.0, it must be set to the latest * 3.0.x release. */ - val previousDottyVersion = "3.4.0-RC3" + val previousDottyVersion = "3.4.0" /** Version against which we check binary compatibility. */ val ltsDottyVersion = "3.3.0" From 8ae80fe1929a20cb949a6fce74ea54956b997a87 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 23 Feb 2024 08:59:09 +0100 Subject: [PATCH 3/3] Remove `ErasedFunction` This can be removed now that the reference compiler (3.4.0) no longer tries to load the symbol of `ErasedFunction`. Follow up of #18295 --- library/src/scala/runtime/ErasedFunction.scala | 13 ------------- .../stdlibExperimentalDefinitions.scala | 1 - 2 files changed, 14 deletions(-) delete mode 100644 library/src/scala/runtime/ErasedFunction.scala diff --git a/library/src/scala/runtime/ErasedFunction.scala b/library/src/scala/runtime/ErasedFunction.scala deleted file mode 100644 index dbbcc3431cc9..000000000000 --- a/library/src/scala/runtime/ErasedFunction.scala +++ /dev/null @@ -1,13 +0,0 @@ -package scala.runtime - -import scala.annotation.experimental - -/** Marker trait for function types with erased parameters. - * - * This trait will be refined with an `apply` method with erased parameters: - * ErasedFunction { def apply([erased] x_1: P_1, ..., [erased] x_N: P_N): R } - * This type will be erased to FunctionL, where L = N - count(erased). - * - * Note: Now we use `scala.PolyFunction` instead. This will be removed. - */ -@experimental trait ErasedFunction // TODO delete. Cannot be deleted until the reference compiler stops using it. diff --git a/tests/run-tasty-inspector/stdlibExperimentalDefinitions.scala b/tests/run-tasty-inspector/stdlibExperimentalDefinitions.scala index 111c8c0bada3..888e5c36405d 100644 --- a/tests/run-tasty-inspector/stdlibExperimentalDefinitions.scala +++ b/tests/run-tasty-inspector/stdlibExperimentalDefinitions.scala @@ -86,7 +86,6 @@ val experimentalDefinitionInLibrary = Set( // New feature: functions with erased parameters. // Need erasedDefinitions enabled. - "scala.runtime.ErasedFunction", // will be removed (now using PolyFunction) "scala.quoted.Quotes.reflectModule.MethodTypeMethods.erasedParams", "scala.quoted.Quotes.reflectModule.MethodTypeMethods.hasErasedParams", "scala.quoted.Quotes.reflectModule.TermParamClauseMethods.erasedArgs",