Skip to content

Commit 49dc1f4

Browse files
committed
Drop retainsUniversal annotation
It can now be expressed as `@retains(caps.*)`.
1 parent 010633b commit 49dc1f4

File tree

4 files changed

+1
-12
lines changed

4 files changed

+1
-12
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1025,7 +1025,6 @@ class Definitions {
10251025
@tu lazy val RequiresCapabilityAnnot: ClassSymbol = requiredClass("scala.annotation.internal.requiresCapability")
10261026
@tu lazy val RetainsAnnot: ClassSymbol = requiredClass("scala.annotation.retains")
10271027
@tu lazy val RetainsByNameAnnot: ClassSymbol = requiredClass("scala.annotation.retainsByName")
1028-
@tu lazy val RetainsUniversalAnnot: ClassSymbol = requiredClass("scala.annotation.retainsUniversal")
10291028

10301029
@tu lazy val JavaRepeatableAnnot: ClassSymbol = requiredClass("java.lang.annotation.Repeatable")
10311030

compiler/src/dotty/tools/dotc/typer/Typer.scala

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2669,16 +2669,10 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
26692669
end typedPackageDef
26702670

26712671
def typedAnnotated(tree: untpd.Annotated, pt: Type)(using Context): Tree = {
2672-
var annot1 = typedExpr(tree.annot, defn.AnnotationClass.typeRef)
2672+
val annot1 = typedExpr(tree.annot, defn.AnnotationClass.typeRef)
26732673
val annotCls = Annotations.annotClass(annot1)
26742674
if annotCls == defn.NowarnAnnot then
26752675
registerNowarn(annot1, tree)
2676-
else if annotCls == defn.RetainsUniversalAnnot then
2677-
annot1 = typedExpr(
2678-
untpd.New(
2679-
untpd.TypeTree(defn.RetainsAnnot.typeRef),
2680-
(untpd.ref(defn.captureRoot) :: Nil) :: Nil).withSpan(tree.annot.span),
2681-
defn.AnnotationClass.typeRef)
26822676
val arg1 = typed(tree.arg, pt)
26832677
if (ctx.mode is Mode.Type) {
26842678
val cls = annot1.symbol.maybeOwner

library/src/scala/annotation/retains.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,3 @@ package scala.annotation
1313
*/
1414
@experimental
1515
class retains(xs: Any*) extends annotation.StaticAnnotation
16-
17-
@experimental
18-
class retainsUniversal extends annotation.StaticAnnotation

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ val experimentalDefinitionInLibrary = Set(
5151
"scala.annotation.internal.WithPureFuns",
5252
"scala.annotation.internal.requiresCapability",
5353
"scala.annotation.retains",
54-
"scala.annotation.retainsUniversal",
5554
"scala.annotation.retainsByName",
5655
"scala.caps",
5756
"scala.caps$",

0 commit comments

Comments
 (0)