Avoid 'capturing' accessor function references

Author: grynspan

Sources/TestingMacros/ConditionMacro.swift

@@ -487,7 +487,15 @@ extension ExitTestConditionMacro {
         named: .identifier("testContentRecord"),
         in: TypeSyntax(IdentifierTypeSyntax(name: enumName)),
         ofKind: .exitTest,
-        accessingWith: .identifier("accessor")
+        accessingWith: """
+        unsafe Testing.ExitTest.__store(
+          \(idExpr),
+          \(bodyThunkName),
+          into: outValue,
+          asTypeAt: type,
+          withHintAt: hint
+        )
+       """
       )
 
       // Create another local type for legacy test discovery.
@@ -507,16 +515,6 @@ extension ExitTestConditionMacro {
         """
         @available(*, deprecated, message: "This type is an implementation detail of the testing library. Do not use it directly.")
         enum \(enumName) {
-          private nonisolated static let accessor: Testing.__TestContentRecordAccessor = { outValue, type, hint, _ in
-            Testing.ExitTest.__store(
-              \(idExpr),
-              \(bodyThunkName),
-              into: outValue,
-              asTypeAt: type,
-              withHintAt: hint
-            )
-          }
-
           \(testContentRecordDecl)
 
           \(recordDecl)

Sources/TestingMacros/SuiteDeclarationMacro.swift

@@ -141,23 +141,15 @@ public struct SuiteDeclarationMacro: MemberMacro, PeerMacro, Sendable {
       """
     )
 
-    let accessorName = context.makeUniqueName("accessor")
-    result.append(
-      """
-      @available(*, deprecated, message: "This property is an implementation detail of the testing library. Do not use it directly.")
-      private nonisolated static let \(accessorName): Testing.__TestContentRecordAccessor = { outValue, type, _, _ in
-        Testing.Test.__store(\(generatorName), into: outValue, asTypeAt: type)
-      }
-      """
-    )
-
     let testContentRecordName = context.makeUniqueName("testContentRecord")
     result.append(
       makeTestContentRecordDecl(
         named: testContentRecordName,
         in: declaration.type,
         ofKind: .testDeclaration,
-        accessingWith: accessorName,
+        accessingWith: """
+        unsafe Testing.Test.__store(\(generatorName), into: outValue, asTypeAt: type)
+        """,
         context: attributeInfo.testContentRecordFlags
       )
     )

Sources/TestingMacros/Support/TestContentGeneration.swift

@@ -47,29 +47,21 @@ enum TestContentKind: UInt32 {
 ///   - typeName: The name of the type enclosing the resulting declaration, or
 ///     `nil` if it will not be emitted into a type's scope.
 ///   - kind: The kind of test content record being emitted.
-///   - accessorName: The Swift name of an `@convention(c)` function to emit
-///     into the resulting record.
+///   - accessorExpr: The accessor function call expression.
 ///   - context: A value to emit as the `context` field of the test content
 ///     record.
 ///
 /// - Returns: A variable declaration that, when emitted into Swift source, will
 ///   cause the linker to emit data in a location that is discoverable at
 ///   runtime.
-func makeTestContentRecordDecl(named name: TokenSyntax, in typeName: TypeSyntax? = nil, ofKind kind: TestContentKind, accessingWith accessorName: TokenSyntax, context: UInt32 = 0) -> DeclSyntax {
+func makeTestContentRecordDecl(named name: TokenSyntax, in typeName: TypeSyntax? = nil, ofKind kind: TestContentKind, accessingWith accessorExpr: ExprSyntax, context: UInt32 = 0) -> DeclSyntax {
   let kindExpr = IntegerLiteralExprSyntax(kind.rawValue, radix: .hex)
   let contextExpr = if context == 0 {
     IntegerLiteralExprSyntax(0)
   } else {
     IntegerLiteralExprSyntax(context, radix: .binary)
   }
 
-  var accessorExpr: ExprSyntax = if let typeName {
-    "\(typeName.trimmed).\(accessorName)"
-  } else {
-    "\(accessorName)"
-  }
-  accessorExpr = "{ unsafe \(accessorExpr)($0, $1, $2, $3) }"
-
   var result: DeclSyntax = """
   @available(*, deprecated, message: "This property is an implementation detail of the testing library. Do not use it directly.")
   private nonisolated \(staticKeyword(for: typeName)) let \(name): Testing.__TestContentRecord = (

Sources/TestingMacros/TestDeclarationMacro.swift

@@ -468,23 +468,15 @@ public struct TestDeclarationMacro: PeerMacro, Sendable {
       """
     )
 
-    let accessorName = context.makeUniqueName(thunking: functionDecl, withPrefix: "accessor")
-    result.append(
-      """
-      @available(*, deprecated, message: "This property is an implementation detail of the testing library. Do not use it directly.")
-      private \(staticKeyword(for: typeName)) nonisolated let \(accessorName): Testing.__TestContentRecordAccessor = { outValue, type, _, _ in
-        Testing.Test.__store(\(generatorName), into: outValue, asTypeAt: type)
-      }
-      """
-    )
-
     let testContentRecordName = context.makeUniqueName(thunking: functionDecl, withPrefix: "testContentRecord")
     result.append(
       makeTestContentRecordDecl(
         named: testContentRecordName,
         in: typeName,
         ofKind: .testDeclaration,
-        accessingWith: accessorName,
+        accessingWith: """
+        unsafe Testing.Test.__store(\(generatorName), into: outValue, asTypeAt: type)
+        """,
         context: attributeInfo.testContentRecordFlags
       )
     )