Merge pull request swiftlang#63220 from AtariDreams/deprecations

Fix DeclarationMacro deprecations

Author: DougGregor

lib/ASTGen/Sources/ASTGen/Macros.swift

@@ -206,7 +206,7 @@ func evaluateMacro(
       evaluatedSyntax = Syntax(try exprMacro.expansion(of: parentExpansion, in: &context))
 
     // Handle expression macro. The resulting decls are wrapped in a `CodeBlockItemListSyntax`.
-    case let declMacro as FreestandingDeclarationMacro.Type:
+    case let declMacro as DeclarationMacro.Type:
       guard let parentExpansion = parentSyntax.as(MacroExpansionDeclSyntax.self) else {
         print("not on a macro expansion node: \(token.recursiveDescription)")
         return -1
@@ -350,7 +350,7 @@ func expandAttachedMacro(
   var evaluatedSyntaxStr: String
   do {
     switch (macro, macroRole) {
-    case (let attachedMacro as AccessorDeclarationMacro.Type, .Accessor):
+    case (let attachedMacro as AccessorMacro.Type, .Accessor):
       let accessors = try attachedMacro.expansion(
         of: customAttrNode, attachedTo: declarationNode, in: &context
       )
@@ -383,7 +383,7 @@ func expandAttachedMacro(
         $0.trimmedDescription
       }.joined(separator: " ")
 
-    case (let attachedMacro as MemberDeclarationMacro.Type, .SynthesizedMembers):
+    case (let attachedMacro as MemberMacro.Type, .SynthesizedMembers):
       let members = try attachedMacro.expansion(
         of: customAttrNode,
         attachedTo: declarationNode,

test/Macros/Inputs/syntax_macro_definitions.swift

@@ -194,7 +194,7 @@ enum CustomError: Error, CustomStringConvertible {
   }
 }
 
-public struct DefineBitwidthNumberedStructsMacro: FreestandingDeclarationMacro {
+public struct DefineBitwidthNumberedStructsMacro: DeclarationMacro {
   public static func expansion(
     of node: MacroExpansionDeclSyntax,
     in context: inout MacroExpansionContext
@@ -217,7 +217,7 @@ public struct DefineBitwidthNumberedStructsMacro: FreestandingDeclarationMacro {
 
 public struct PropertyWrapperMacro {}
 
-extension PropertyWrapperMacro: AccessorDeclarationMacro, Macro {
+extension PropertyWrapperMacro: AccessorMacro, Macro {
   public static func expansion(
     of node: AttributeSyntax,
     attachedTo declaration: DeclSyntax,
@@ -307,7 +307,7 @@ extension TypeWrapperMacro: MemberAttributeMacro {
   }
 }
 
-extension TypeWrapperMacro: MemberDeclarationMacro {
+extension TypeWrapperMacro: MemberMacro {
   public static func expansion(
     of node: AttributeSyntax,
     attachedTo decl: DeclSyntax,
@@ -324,7 +324,7 @@ extension TypeWrapperMacro: MemberDeclarationMacro {
   }
 }
 
-public struct AccessViaStorageMacro: AccessorDeclarationMacro {
+public struct AccessViaStorageMacro: AccessorMacro {
   public static func expansion(
     of node: AttributeSyntax,
     attachedTo declaration: DeclSyntax,
@@ -349,7 +349,7 @@ public struct AccessViaStorageMacro: AccessorDeclarationMacro {
   }
 }
 
-public struct AddMembers: MemberDeclarationMacro {
+public struct AddMembers: MemberMacro {
   public static func expansion(
     of node: AttributeSyntax,
     attachedTo decl: DeclSyntax,

test/Serialization/Inputs/def_macro_plugin.swift

@@ -15,7 +15,7 @@ public struct StringifyMacro: ExpressionMacro {
   }
 }
 
-public struct MyWrapperMacro: AccessorDeclarationMacro {
+public struct MyWrapperMacro: AccessorMacro {
     public static func expansion(
     of node: AttributeSyntax,
     attachedTo declaration: DeclSyntax,