Fix Swift 5.7 build errors (#676)

Insert missing comma in targets array in Package.swift to fix Swift 5.7 build
break from commit 83c5134.

Replace 2 if expressions (which are not supported by Swift 5.7) that were added
to ToolInfo.swift by commit 83c5134.

Replace switch expression (which is not supported by Swift 5.7) that was added
to GenerateManual.swift by commit 44dd206.

Replace switch expression (which is not supported by Swift 5.7) that was added
to DumpHelpGenerationTests.swift by commit 83c5134.

Fixes #675

Signed-off-by: Ross Goldberg <[email protected]>

Author: rgoldberg

Package.swift

@@ -61,9 +61,9 @@ var package = Package(
             dependencies: ["ArgumentParser"],
             path: "Examples/repeat"),
         .executableTarget(
-          name: "color",
-          dependencies: ["ArgumentParser"],
-          path: "Examples/color")
+            name: "color",
+            dependencies: ["ArgumentParser"],
+            path: "Examples/color"),
 
         // Tools
         .executableTarget(

Sources/ArgumentParserToolInfo/ToolInfo.swift

@@ -186,14 +186,15 @@ public struct CommandInfoV0: Codable, Hashable {
     subcommands: [CommandInfoV0],
     arguments: [ArgumentInfoV0]
   ) {
-    let discussion: Discussion? = if let discussion { .init(discussion) } else { nil }
+    let discussion2: Discussion?
+    if let discussion { discussion2 = .init(discussion) } else { discussion2 = nil }
 
     self.init(
       superCommands: superCommands,
       commandName: commandName,
       shouldDisplay: true,
       abstract: abstract,
-      discussion2: discussion,
+      discussion2: discussion2,
       defaultSubcommand: defaultSubcommand,
       subcommands: subcommands,
       arguments: arguments
@@ -349,7 +350,8 @@ public struct ArgumentInfoV0: Codable, Hashable {
     abstract: String?,
     discussion: String?
   ) {
-    let discussion: Discussion? = if let discussion { .init(discussion) } else { nil }
+    let discussion2: Discussion?
+    if let discussion { discussion2 = .init(discussion) } else { discussion2 = nil }
 
     self.init(
       kind: kind,
@@ -363,8 +365,7 @@ public struct ArgumentInfoV0: Codable, Hashable {
       defaultValue: defaultValue,
       allValues: allValues,
       abstract: abstract,
-      discussion2: discussion
+      discussion2: discussion2
     )
   }
 }
-

Tests/ArgumentParserUnitTests/DumpHelpGenerationTests.swift

@@ -64,11 +64,11 @@ extension DumpHelpGenerationTests {
       var defaultValueDescription: String {
         switch self {
         case .blue:
-          "A blue color, like the sky!"
+          return "A blue color, like the sky!"
         case .red:
-          "A red color, like a rose!"
+          return "A red color, like a rose!"
         case .yellow:
-          "A yellow color, like the sun!"
+          return "A yellow color, like the sun!"
         }
       }
     }

Tools/generate-manual/GenerateManual.swift

@@ -24,13 +24,13 @@ extension GenerateManualError: CustomStringConvertible {
   var description: String {
     switch self {
     case let .failedToRunSubprocess(error):
-      "Failed to run subprocess: \(error)"
+      return "Failed to run subprocess: \(error)"
     case let .unableToParseToolOutput(error):
-      "Failed to parse tool output: \(error)"
+      return "Failed to parse tool output: \(error)"
     case let .unsupportedDumpHelpVersion(expected, found):
-      "Unsupported dump help version, expected '\(expected)' but found: '\(found)'"
+      return "Unsupported dump help version, expected '\(expected)' but found: '\(found)'"
     case let .failedToGenerateManualPages(error):
-      "Failed to generated manual pages: \(error)"
+      return "Failed to generated manual pages: \(error)"
     }
   }
 }