From 96a4c1b6dd9be71a8d5e73ca35c7b06c2359ab3d Mon Sep 17 00:00:00 2001 From: Olivier Blanvillain <olivier.blanvillain@gmail.com> Date: Tue, 17 May 2022 11:29:34 +0200 Subject: [PATCH] Update annotations --- library/src/scala/compiletime/ops/any.scala | 4 ---- library/src/scala/compiletime/ops/double.scala | 3 --- library/src/scala/compiletime/ops/float.scala | 3 --- library/src/scala/compiletime/ops/int.scala | 6 ------ library/src/scala/compiletime/ops/long.scala | 3 --- library/src/scala/compiletime/ops/string.scala | 6 ------ .../stdlibExperimentalDefinitions.scala | 18 ------------------ 7 files changed, 43 deletions(-) diff --git a/library/src/scala/compiletime/ops/any.scala b/library/src/scala/compiletime/ops/any.scala index b3898f7896bb..ba3b6809fb49 100644 --- a/library/src/scala/compiletime/ops/any.scala +++ b/library/src/scala/compiletime/ops/any.scala @@ -1,8 +1,6 @@ package scala.compiletime package ops -import annotation.experimental - object any: /** Equality comparison of two singleton types. * ```scala @@ -41,7 +39,6 @@ object any: * ``` * @syntax markdown */ - @experimental type IsConst[X] <: Boolean /** String conversion of a constant singleton type. @@ -51,5 +48,4 @@ object any: * ``` * @syntax markdown */ - @experimental type ToString[+X] <: String diff --git a/library/src/scala/compiletime/ops/double.scala b/library/src/scala/compiletime/ops/double.scala index e8eb85291a65..91f65f644e4b 100644 --- a/library/src/scala/compiletime/ops/double.scala +++ b/library/src/scala/compiletime/ops/double.scala @@ -1,9 +1,6 @@ package scala.compiletime package ops -import scala.annotation.experimental - -@experimental object double: /** Addition of two `Double` singleton types. * ```scala diff --git a/library/src/scala/compiletime/ops/float.scala b/library/src/scala/compiletime/ops/float.scala index 3b9a3452929f..c42aa4aec70f 100644 --- a/library/src/scala/compiletime/ops/float.scala +++ b/library/src/scala/compiletime/ops/float.scala @@ -1,9 +1,6 @@ package scala.compiletime package ops -import scala.annotation.experimental - -@experimental object float: /** Addition of two `Float` singleton types. * ```scala diff --git a/library/src/scala/compiletime/ops/int.scala b/library/src/scala/compiletime/ops/int.scala index 935d0dd2a45c..ef7707173a00 100644 --- a/library/src/scala/compiletime/ops/int.scala +++ b/library/src/scala/compiletime/ops/int.scala @@ -1,8 +1,6 @@ package scala.compiletime package ops -import annotation.experimental - object int: /** Successor of a natural number where zero is the type 0 and successors are reduced as if the definition was: * @@ -192,7 +190,6 @@ object int: * ``` * @syntax markdown */ - @experimental type ToLong[+X <: Int] <: Long /** Float conversion of an `Int` singleton type. @@ -201,7 +198,6 @@ object int: * ``` * @syntax markdown */ - @experimental type ToFloat[+X <: Int] <: Float /** Double conversion of an `Int` singleton type. @@ -210,7 +206,6 @@ object int: * ``` * @syntax markdown */ - @experimental type ToDouble[+X <: Int] <: Double /** Number of zero bits preceding the highest-order ("leftmost") @@ -225,5 +220,4 @@ object int: * ``` * @syntax markdown */ - @experimental type NumberOfLeadingZeros[+X <: Int] <: Int diff --git a/library/src/scala/compiletime/ops/long.scala b/library/src/scala/compiletime/ops/long.scala index 87c0c90631c9..1d10e3bf3213 100644 --- a/library/src/scala/compiletime/ops/long.scala +++ b/library/src/scala/compiletime/ops/long.scala @@ -1,9 +1,6 @@ package scala.compiletime package ops -import scala.annotation.experimental - -@experimental object long: /** Successor of a natural number where zero is the type 0 and successors are reduced as if the definition was: * diff --git a/library/src/scala/compiletime/ops/string.scala b/library/src/scala/compiletime/ops/string.scala index 3c7d2aefb4e1..18c5b13871b1 100644 --- a/library/src/scala/compiletime/ops/string.scala +++ b/library/src/scala/compiletime/ops/string.scala @@ -1,8 +1,6 @@ package scala.compiletime package ops -import scala.annotation.experimental - object string: /** Concatenation of two `String` singleton types. * ```scala @@ -18,7 +16,6 @@ object string: * ``` * @syntax markdown */ - @experimental type Length[+X <: String] <: Int /** Substring of a `String` singleton type, with a singleton type @@ -31,7 +28,6 @@ object string: * ``` * @syntax markdown */ - @experimental type Substring[+S <: String, +IBeg <: Int, +IEnd <: Int] <: String /** Tests if this `String` singleton type matches the given @@ -41,7 +37,6 @@ object string: * ``` * @syntax markdown */ - @experimental type Matches[+S <: String, +Regex <: String] <: Boolean /** Returns the Char type at the specified index. @@ -52,5 +47,4 @@ object string: * ``` * @syntax markdown */ - @experimental type CharAt[+S <: String, +Idx <: Int] <: Char diff --git a/tests/run-custom-args/tasty-inspector/stdlibExperimentalDefinitions.scala b/tests/run-custom-args/tasty-inspector/stdlibExperimentalDefinitions.scala index 29b1de4692f1..d3797d2d8ac3 100644 --- a/tests/run-custom-args/tasty-inspector/stdlibExperimentalDefinitions.scala +++ b/tests/run-custom-args/tasty-inspector/stdlibExperimentalDefinitions.scala @@ -32,24 +32,6 @@ val experimentalDefinitionInLibrary = Set( "scala.annotation.MainAnnotation", "scala.annotation.MainAnnotation$", - //// New APIs: compiletime.ops - // Can be stabilized in 3.3.0 or later. - // Needs user feedback - "scala.compiletime.ops.any$.IsConst", - "scala.compiletime.ops.any$.ToString", - "scala.compiletime.ops.double", "scala.compiletime.ops.double$", - "scala.compiletime.ops.float", - "scala.compiletime.ops.float$", - "scala.compiletime.ops.int$.NumberOfLeadingZeros", - "scala.compiletime.ops.int$.ToDouble", - "scala.compiletime.ops.int$.ToFloat", - "scala.compiletime.ops.int$.ToLong", - "scala.compiletime.ops.long", "scala.compiletime.ops.long$", - "scala.compiletime.ops.string$.Length", - "scala.compiletime.ops.string$.Matches", - "scala.compiletime.ops.string$.Substring", - "scala.compiletime.ops.string$.CharAt", - //// New APIs: Mirror // Can be stabilized in 3.2.0 or later. "scala.deriving.Mirror$.fromTuple", // Probably for 3.2.0