Drop the fancy functional stuff

DougGregor · DougGregor · commit 5be3dee066d6 · 2023-03-03T21:39:19.000-08:00
diff --git a/lib/Macros/Sources/SwiftMacros/OptionSetMacro.swift b/lib/Macros/Sources/SwiftMacros/OptionSetMacro.swift
@@ -162,12 +162,11 @@ extension OptionSetMacro: MemberMacro {
     }
 
     // Find all of the case elements.
-    let caseElements: [EnumCaseElementSyntax] = optionsEnum.members.members.flatMap { member in
-      guard let caseDecl = member.decl.as(EnumCaseDeclSyntax.self) else {
-        return Array<EnumCaseElementSyntax>()
+    var caseElements: [EnumCaseElementSyntax] = []
+    for member in optionsEnum.members.members {
+      if let caseDecl = member.decl.as(EnumCaseDeclSyntax.self) {
+        caseElements.append(contentsOf: caseDecl.elements)
       }
-
-      return Array(caseDecl.elements)
     }
 
     // Dig out the access control keyword we need.

Original file line number	Diff line number	Diff line change
`@@ -162,12 +162,11 @@ extension OptionSetMacro: MemberMacro {`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`// Find all of the case elements.`
`165`		`- let caseElements: [EnumCaseElementSyntax] = optionsEnum.members.members.flatMap { member in`
`166`		`- guard let caseDecl = member.decl.as(EnumCaseDeclSyntax.self) else {`
`167`		`- return Array<EnumCaseElementSyntax>()`
	`165`	`+ var caseElements: [EnumCaseElementSyntax] = []`
	`166`	`+ for member in optionsEnum.members.members {`
	`167`	`+ if let caseDecl = member.decl.as(EnumCaseDeclSyntax.self) {`
	`168`	`+ caseElements.append(contentsOf: caseDecl.elements)`
`168`	`169`	`}`
`169`		`-`
`170`		`- return Array(caseDecl.elements)`
`171`	`170`	`}`
`172`	`171`
`173`	`172`	`// Dig out the access control keyword we need.`