Add capture checking to annotations

natsukagami · natsukagami · commit d847d039fe66 · 2025-08-07T22:55:26.000+02:00
diff --git a/TODO.md b/TODO.md
@@ -8,47 +8,47 @@
 - [x] library/src/scala/Pure.scala
 - [x] library/src/scala/Selectable.scala
 - [x] library/src/scala/Tuple.scala
-- [ ] library/src/scala/annotation/MacroAnnotation.scala
-- [ ] library/src/scala/annotation/RefiningAnnotation.scala
-- [ ] library/src/scala/annotation/alpha.scala
-- [ ] library/src/scala/annotation/capability.scala
-- [ ] library/src/scala/annotation/constructorOnly.scala
-- [ ] library/src/scala/annotation/experimental.scala
-- [ ] library/src/scala/annotation/init.scala
-- [ ] library/src/scala/annotation/internal/$into.scala
-- [ ] library/src/scala/annotation/internal/Alias.scala
-- [ ] library/src/scala/annotation/internal/AnnotationDefault.scala
-- [ ] library/src/scala/annotation/internal/AssignedNonLocally.scala
-- [ ] library/src/scala/annotation/internal/Body.scala
-- [ ] library/src/scala/annotation/internal/CaptureChecked.scala
-- [ ] library/src/scala/annotation/internal/Child.scala
-- [ ] library/src/scala/annotation/internal/ContextResultCount.scala
-- [ ] library/src/scala/annotation/internal/ErasedParam.scala
-- [ ] library/src/scala/annotation/internal/InlineParam.scala
-- [ ] library/src/scala/annotation/internal/MappedAlternative.scala
-- [ ] library/src/scala/annotation/internal/ProvisionalSuperClass.scala
-- [ ] library/src/scala/annotation/internal/Repeated.scala
-- [ ] library/src/scala/annotation/internal/RuntimeChecked.scala
-- [ ] library/src/scala/annotation/internal/SourceFile.scala
-- [ ] library/src/scala/annotation/internal/WithPureFuns.scala
-- [ ] library/src/scala/annotation/internal/WitnessNames.scala
-- [ ] library/src/scala/annotation/internal/preview.scala
-- [ ] library/src/scala/annotation/internal/reachCapability.scala
-- [ ] library/src/scala/annotation/internal/readOnlyCapability.scala
-- [ ] library/src/scala/annotation/internal/requiresCapability.scala
-- [ ] library/src/scala/annotation/internal/sharable.scala
-- [ ] library/src/scala/annotation/internal/unshared.scala
-- [ ] library/src/scala/annotation/into.scala
-- [ ] library/src/scala/annotation/publicInBinary.scala
-- [ ] library/src/scala/annotation/retains.scala
-- [ ] library/src/scala/annotation/retainsByName.scala
-- [ ] library/src/scala/annotation/static.scala
-- [ ] library/src/scala/annotation/targetName.scala
-- [ ] library/src/scala/annotation/threadUnsafe.scala
-- [ ] library/src/scala/annotation/transparentTrait.scala
+- [x] library/src/scala/annotation/MacroAnnotation.scala
+- [x] library/src/scala/annotation/RefiningAnnotation.scala
+- [x] library/src/scala/annotation/alpha.scala
+- [x] library/src/scala/annotation/capability.scala
+- [x] library/src/scala/annotation/constructorOnly.scala
+- [x] library/src/scala/annotation/experimental.scala
+- [x] library/src/scala/annotation/init.scala
+- [x] library/src/scala/annotation/internal/$into.scala
+- [x] library/src/scala/annotation/internal/Alias.scala
+- [x] library/src/scala/annotation/internal/AnnotationDefault.scala
+- [x] library/src/scala/annotation/internal/AssignedNonLocally.scala
+- [x] library/src/scala/annotation/internal/Body.scala
+- [x] library/src/scala/annotation/internal/CaptureChecked.scala
+- [x] library/src/scala/annotation/internal/Child.scala
+- [x] library/src/scala/annotation/internal/ContextResultCount.scala
+- [x] library/src/scala/annotation/internal/ErasedParam.scala
+- [x] library/src/scala/annotation/internal/InlineParam.scala
+- [x] library/src/scala/annotation/internal/MappedAlternative.scala
+- [x] library/src/scala/annotation/internal/ProvisionalSuperClass.scala
+- [x] library/src/scala/annotation/internal/Repeated.scala
+- [x] library/src/scala/annotation/internal/RuntimeChecked.scala
+- [x] library/src/scala/annotation/internal/SourceFile.scala
+- [x] library/src/scala/annotation/internal/WithPureFuns.scala
+- [x] library/src/scala/annotation/internal/WitnessNames.scala
+- [x] library/src/scala/annotation/internal/preview.scala
+- [x] library/src/scala/annotation/internal/reachCapability.scala
+- [x] library/src/scala/annotation/internal/readOnlyCapability.scala
+- [x] library/src/scala/annotation/internal/requiresCapability.scala
+- [x] library/src/scala/annotation/internal/sharable.scala
+- [x] library/src/scala/annotation/internal/unshared.scala
+- [x] library/src/scala/annotation/into.scala
+- [x] library/src/scala/annotation/publicInBinary.scala
+- [x] library/src/scala/annotation/retains.scala
+- [x] library/src/scala/annotation/retainsByName.scala
+- [x] library/src/scala/annotation/static.scala
+- [x] library/src/scala/annotation/targetName.scala
+- [x] library/src/scala/annotation/threadUnsafe.scala
+- [x] library/src/scala/annotation/transparentTrait.scala
 - [ ] library/src/scala/annotation/unchecked/uncheckedCapabilityLeaks.scala
-- [ ] library/src/scala/annotation/unchecked/uncheckedCaptures.scala
-- [ ] library/src/scala/annotation/unroll.scala
+- [x] library/src/scala/annotation/unchecked/uncheckedCaptures.scala
+- [x] library/src/scala/annotation/unroll.scala
 - [x] library/src/scala/caps/package.scala
 - [x] library/src/scala/compiletime/ops/any.scala
 - [x] library/src/scala/compiletime/ops/boolean.scala
diff --git a/library/src/scala/annotation/MacroAnnotation.scala b/library/src/scala/annotation/MacroAnnotation.scala
@@ -2,6 +2,8 @@
 package scala
 package annotation
 
+import language.experimental.captureChecking
+
 import scala.quoted.*
 
 /** Base trait for macro annotation implementation.
diff --git a/library/src/scala/annotation/RefiningAnnotation.scala b/library/src/scala/annotation/RefiningAnnotation.scala
@@ -1,5 +1,7 @@
 package scala.annotation
 
+import language.experimental.captureChecking
+
 /** A base trait for annotations that yield proper subtypes of the types they annotate.
  *  Refining annotations are more "sticky" than normal ones. They are conceptually kept
  *  around when normal refinements would also not be stripped away.
diff --git a/library/src/scala/annotation/alpha.scala b/library/src/scala/annotation/alpha.scala
@@ -1,5 +1,7 @@
 package scala.annotation
 
+import language.experimental.captureChecking
+
 /** An annotation that defines an external name for a definition.
  *  If an `alpha(extname)` annotation is given for a method or some other
  *  definition, its implementation will use the name `extname` instead of
diff --git a/library/src/scala/annotation/capability.scala b/library/src/scala/annotation/capability.scala
@@ -1,6 +1,8 @@
 package scala.annotation
 import annotation.experimental
 
+import language.experimental.captureChecking
+
 /** Marks an annotated class as a capability.
  *  If the annotation is present and -Ycc is set, any (possibly aliased
  *  or refined) instance of the class type is implicitly augmented with
diff --git a/library/src/scala/annotation/constructorOnly.scala b/library/src/scala/annotation/constructorOnly.scala
@@ -8,6 +8,8 @@
 
 package scala.annotation
 
+import language.experimental.captureChecking
+
 import scala.annotation.meta.*
 
 /** An annotation that goes on parameters of classes or traits. It asserts
diff --git a/library/src/scala/annotation/experimental.scala b/library/src/scala/annotation/experimental.scala
@@ -1,5 +1,7 @@
 package scala.annotation
 
+import language.experimental.captureChecking
+
 /** An annotation that can be used to mark a definition as experimental.
  *
  *  @see [[https://dotty.epfl.ch/docs/reference/other-new-features/experimental-defs]]
diff --git a/library/src/scala/annotation/init.scala b/library/src/scala/annotation/init.scala
@@ -1,5 +1,7 @@
 package scala.annotation
 
+import language.experimental.captureChecking
+
 /** Annotations to control the behavior of the compiler check for safe initialization of static obects.
  *
  *  Programmers usually do not need to use any annotations. They are intended for complex initialization
diff --git a/library/src/scala/annotation/internal/$into.scala b/library/src/scala/annotation/internal/$into.scala
@@ -1,4 +1,7 @@
 package scala.annotation.internal
+
+import language.experimental.captureChecking
+
 import annotation.experimental
 
 /** An internal annotation on (part of) a parameter type that serves as a marker where
diff --git a/library/src/scala/annotation/internal/Alias.scala b/library/src/scala/annotation/internal/Alias.scala
@@ -1,5 +1,7 @@
 package scala.annotation.internal
 
+import language.experimental.captureChecking
+
 import scala.annotation.Annotation
 
 /** An annotation to record a Scala2 pickled alias.
diff --git a/library/src/scala/annotation/internal/AnnotationDefault.scala b/library/src/scala/annotation/internal/AnnotationDefault.scala
@@ -1,5 +1,7 @@
 package scala.annotation.internal
 
+import language.experimental.captureChecking
+
 import scala.annotation.Annotation
 
 /** An annotation to tag Java annotation default values */
diff --git a/library/src/scala/annotation/internal/AssignedNonLocally.scala b/library/src/scala/annotation/internal/AssignedNonLocally.scala
@@ -1,6 +1,8 @@
 package scala.annotation
 package internal
 
+import language.experimental.captureChecking
+
 /** An annotation to indicate that a private `var` was assigned with a prefix
  *  other than the `this` type of its owner.
  */
diff --git a/library/src/scala/annotation/internal/Body.scala b/library/src/scala/annotation/internal/Body.scala
@@ -1,5 +1,7 @@
 package scala.annotation.internal
 
+import language.experimental.captureChecking
+
 import scala.annotation.Annotation
 
 /** The class associated with a `BodyAnnotation`, which indicates
diff --git a/library/src/scala/annotation/internal/CaptureChecked.scala b/library/src/scala/annotation/internal/CaptureChecked.scala
@@ -1,6 +1,8 @@
 package scala.annotation
 package internal
 
+import language.experimental.captureChecking
+
 /** A marker annotation on a toplevel class that indicates
  *  that the class was typed with the captureChecking language import.
  */
diff --git a/library/src/scala/annotation/internal/Child.scala b/library/src/scala/annotation/internal/Child.scala
@@ -1,6 +1,8 @@
 package scala.annotation
 package internal
 
+import language.experimental.captureChecking
+
 /** An annotation to indicate a child class or object of the annotated class.
  *  E.g. if we have
  *
diff --git a/library/src/scala/annotation/internal/ContextResultCount.scala b/library/src/scala/annotation/internal/ContextResultCount.scala
@@ -1,6 +1,8 @@
 package scala.annotation
 package internal
 
+import language.experimental.captureChecking
+
 /** An annotation that's automatically added for methods
  *  that have one or more nested context closures as their right hand side.
  *  The parameter `n` is an Int Literal that tells how many nested closures
diff --git a/library/src/scala/annotation/internal/ErasedParam.scala b/library/src/scala/annotation/internal/ErasedParam.scala
@@ -1,5 +1,7 @@
 package scala.annotation
 package internal
 
+import language.experimental.captureChecking
+
 /** An annotation produced by Namer to indicate an erased parameter */
 final class ErasedParam() extends Annotation
diff --git a/library/src/scala/annotation/internal/InlineParam.scala b/library/src/scala/annotation/internal/InlineParam.scala
@@ -1,5 +1,7 @@
 package scala.annotation.internal
 
+import language.experimental.captureChecking
+
 import scala.annotation.Annotation
 
 /** An annotation produced by Namer to indicate an inline parameter */
diff --git a/library/src/scala/annotation/internal/MappedAlternative.scala b/library/src/scala/annotation/internal/MappedAlternative.scala
@@ -1,6 +1,8 @@
 package scala.annotation
 package internal
 
+import language.experimental.captureChecking
+
 /** An annotation added by overloading resoluton to mapped symbols that
  *  explore deeper into the types of the opverloaded alternatives.
  *  Its tree is a TypeTree with two parameters which are both needed to
diff --git a/library/src/scala/annotation/internal/ProvisionalSuperClass.scala b/library/src/scala/annotation/internal/ProvisionalSuperClass.scala
@@ -1,6 +1,8 @@
 package scala.annotation
 package internal
 
+import language.experimental.captureChecking
+
 /** An annotation to record a provisional super class */
 class ProvisionalSuperClass extends StaticAnnotation
 
diff --git a/library/src/scala/annotation/internal/Repeated.scala b/library/src/scala/annotation/internal/Repeated.scala
@@ -1,5 +1,7 @@
 package scala.annotation.internal
 
+import language.experimental.captureChecking
+
 import scala.annotation.Annotation
 
 /** An annotation produced by desugaring to indicate that a
diff --git a/library/src/scala/annotation/internal/RuntimeChecked.scala b/library/src/scala/annotation/internal/RuntimeChecked.scala
@@ -1,5 +1,7 @@
 package scala.annotation.internal
 
+import language.experimental.captureChecking
+
 import scala.annotation.Annotation
 import scala.annotation.experimental
 
diff --git a/library/src/scala/annotation/internal/SourceFile.scala b/library/src/scala/annotation/internal/SourceFile.scala
@@ -1,5 +1,7 @@
 package scala.annotation.internal
 
+import language.experimental.captureChecking
+
 import scala.annotation.Annotation
 
 /** An annotation to record a Scala2 pickled alias.
diff --git a/library/src/scala/annotation/internal/WithPureFuns.scala b/library/src/scala/annotation/internal/WithPureFuns.scala
@@ -1,6 +1,8 @@
 package scala.annotation
 package internal
 
+import language.experimental.captureChecking
+
 /** A marker annotation on a toplevel class that indicates
  *  that the class was typed with the pureFunctions language import.
  */
diff --git a/library/src/scala/annotation/internal/WitnessNames.scala b/library/src/scala/annotation/internal/WitnessNames.scala
@@ -1,6 +1,8 @@
 package scala.annotation
 package internal
 
+import language.experimental.captureChecking
+
 /** An annotation that is used for marking type definitions that should get
  *  context bound companions. The scheme is as follows:
  *
diff --git a/library/src/scala/annotation/internal/preview.scala b/library/src/scala/annotation/internal/preview.scala
@@ -1,6 +1,7 @@
 package scala.annotation
 package internal
 
+import language.experimental.captureChecking
 
 /** An annotation that can be used to mark a definition as preview.
  *
diff --git a/library/src/scala/annotation/internal/reachCapability.scala b/library/src/scala/annotation/internal/reachCapability.scala
@@ -1,6 +1,8 @@
 package scala.annotation
 package internal
 
+import language.experimental.captureChecking
+
 /** An annotation that marks a capture ref as a reach capability.
  *  `x*` is encoded as `x.type @reachCapability`
  */
diff --git a/library/src/scala/annotation/internal/readOnlyCapability.scala b/library/src/scala/annotation/internal/readOnlyCapability.scala
@@ -1,6 +1,8 @@
 package scala.annotation
 package internal
 
+import language.experimental.captureChecking
+
 /** An annotation that marks a capture ref as a read-only capability.
  *  `x.rd` is encoded as `x.type @readOnlyCapability`
  */
diff --git a/library/src/scala/annotation/internal/requiresCapability.scala b/library/src/scala/annotation/internal/requiresCapability.scala
@@ -1,6 +1,8 @@
 package scala.annotation.internal
 import annotation.StaticAnnotation
 
+import language.experimental.captureChecking
+
 /** An annotation to record a required capaility in the type of a throws
  */
 class requiresCapability(capability: Any) extends StaticAnnotation
diff --git a/library/src/scala/annotation/internal/sharable.scala b/library/src/scala/annotation/internal/sharable.scala
@@ -1,5 +1,7 @@
 package scala.annotation.internal
 
+import language.experimental.captureChecking
+
 import scala.annotation.Annotation
 
 /** An annotation indicating to `-Ycheck:reentrant` that a class or val can be safely shared.
diff --git a/library/src/scala/annotation/internal/unshared.scala b/library/src/scala/annotation/internal/unshared.scala
@@ -1,5 +1,7 @@
 package scala.annotation.internal
 
+import language.experimental.captureChecking
+
 import scala.annotation.Annotation
 
 /** An annotation indicating to `-Ycheck:reentrant` that an object will not be accessed from multiple threads.
diff --git a/library/src/scala/annotation/publicInBinary.scala b/library/src/scala/annotation/publicInBinary.scala
@@ -1,5 +1,7 @@
 package scala.annotation
 
+import language.experimental.captureChecking
+
 /** A binary API is a definition that is annotated with `@publicInBinary`.
  *  This annotation can be placed on `def`, `val`, `lazy val`, `var`, class constructors, `object`, and `given` definitions.
  *  A binary API will be publicly available in the bytecode. Tools like TASTy MiMa will take this into account to check
diff --git a/library/src/scala/annotation/retains.scala b/library/src/scala/annotation/retains.scala
@@ -1,5 +1,7 @@
 package scala.annotation
 
+import language.experimental.captureChecking
+
 /** An annotation that indicates capture of a set of references under capture checking.
  *
  *      T @retains[x.type | y.type | z.type]
diff --git a/library/src/scala/annotation/retainsByName.scala b/library/src/scala/annotation/retainsByName.scala
@@ -1,5 +1,7 @@
 package scala.annotation
 
+import language.experimental.captureChecking
+
 /** An annotation that indicates capture of an enclosing by-name type
  */
 @experimental class retainsByName[Elems] extends annotation.StaticAnnotation
diff --git a/library/src/scala/annotation/static.scala b/library/src/scala/annotation/static.scala
@@ -1,5 +1,7 @@
 package scala.annotation
 
+import language.experimental.captureChecking
+
 import scala.annotation.meta.*
 
 /** https://github.com/scala/scala.github.com/pull/491 */
diff --git a/library/src/scala/annotation/targetName.scala b/library/src/scala/annotation/targetName.scala
@@ -1,5 +1,7 @@
 package scala.annotation
 
+import language.experimental.captureChecking
+
 /** An annotation that defines an external name for a definition.
  *  If an `targetName(extname)` annotation is given for a method or some other
  *  definition, its implementation will use the name `extname` instead of
diff --git a/library/src/scala/annotation/threadUnsafe.scala b/library/src/scala/annotation/threadUnsafe.scala
@@ -1,5 +1,7 @@
 package scala.annotation
 
+import language.experimental.captureChecking
+
 /** This annotation can only be used on a field which defines a lazy val.
  *  When this annotation is used, the initialization of the lazy val will use a
  *  faster mechanism which is not thread-safe.
diff --git a/library/src/scala/annotation/transparentTrait.scala b/library/src/scala/annotation/transparentTrait.scala
@@ -1,5 +1,7 @@
 package scala.annotation
 
+import language.experimental.captureChecking
+
 /** An annotation that can be used from Scala 2 to mark a trait as transparent.
  *  Scala 3 code would use the modifier `transparent` instead. Transparent traits
  *  are not inferred when combined with other types in an intersection.
diff --git a/library/src/scala/annotation/unchecked/uncheckedCaptures.scala b/library/src/scala/annotation/unchecked/uncheckedCaptures.scala
diff --git a/library/src/scala/annotation/unroll.scala b/library/src/scala/annotation/unroll.scala

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`package scala.annotation`
`2`	`2`
	`3`	`+import language.experimental.captureChecking`
	`4`	`+`
`3`	`5`	`/** An annotation that can be used to mark a definition as experimental.`
`4`	`6`	`*`
`5`	`7`	`* @see [[https://dotty.epfl.ch/docs/reference/other-new-features/experimental-defs]]`