Drop Swift 4.2 guarding for CaseIterable code.

Progress on #1210
apple · Apr 7, 2022 · e1d6275 · e1d6275
1 parent 7a707a3
commit e1d6275
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 19 deletions.
diff --git a/Sources/protoc-gen-swift/EnumGenerator.swift b/Sources/protoc-gen-swift/EnumGenerator.swift
@@ -85,19 +85,13 @@ class EnumGenerator {
     p.print("}\n")
   }
 
-  func generateCaseIterable(
-    printer p: inout CodePrinter,
-    includeGuards: Bool = true
-  ) {
+  func generateCaseIterable(printer p: inout CodePrinter) {
     // NOTE: When we can assume Swift 4.2, this should move from an extension
     // to being directly done when declaring the type.
 
     let visibility = generatorOptions.visibilitySourceSnippet
 
     p.print("\n")
-    if includeGuards {
-      p.print("#if swift(>=4.2)\n\n")
-    }
     p.print("extension \(swiftFullName): CaseIterable {\n")
     p.indent()
     if enumDescriptor.hasUnknownPreservingSemantics {
@@ -113,9 +107,6 @@ class EnumGenerator {
     }
     p.outdent()
     p.print("}\n")
-    if includeGuards {
-      p.print("\n#endif  // swift(>=4.2)\n")
-    }
   }
 
   func generateRuntimeSupport(printer p: inout CodePrinter) {

diff --git a/Sources/protoc-gen-swift/FileGenerator.swift b/Sources/protoc-gen-swift/FileGenerator.swift
@@ -130,14 +130,7 @@ class FileGenerator {
 
         for m in messages {
             m.generateMainStruct(printer: &p, parent: nil, errorString: &errorString)
-
-            var caseIterablePrinter = CodePrinter()
-            m.generateEnumCaseIterable(printer: &caseIterablePrinter)
-            if !caseIterablePrinter.isEmpty {
-              p.print("\n#if swift(>=4.2)\n")
-              p.print(caseIterablePrinter.content)
-              p.print("\n#endif  // swift(>=4.2)\n")
-            }
+            m.generateEnumCaseIterable(printer: &p)
         }
 
         var sendablePrinter = CodePrinter()

diff --git a/Sources/protoc-gen-swift/MessageGenerator.swift b/Sources/protoc-gen-swift/MessageGenerator.swift
@@ -187,7 +187,7 @@ class MessageGenerator {
 
   func generateEnumCaseIterable(printer p: inout CodePrinter) {
     for e in enums {
-      e.generateCaseIterable(printer: &p, includeGuards: false)
+      e.generateCaseIterable(printer: &p)
     }
     for m in messages {
       m.generateEnumCaseIterable(printer: &p)