Update swift-argument-parser to 0.3.0

Author: owenv

Package.resolved

@@ -5,21 +5,9 @@
         "package": "swift-argument-parser",
         "repositoryURL": "https://github.com/apple/swift-argument-parser.git",
         "state": {
-<<<<<<< HEAD
           "branch": null,
           "revision": "15351c1cd009eba0b6e438bfef55ea9847a8dc4a",
           "version": "0.3.0"
-=======
-<<<<<<< HEAD
-          "branch": "master",
-          "revision": "15351c1cd009eba0b6e438bfef55ea9847a8dc4a",
-          "version": null
-=======
-          "branch": null,
-          "revision": "223d62adc52d51669ae2ee19bdb8b7d9fd6fcd9c",
-          "version": "0.0.6"
->>>>>>> Add swift-argument-parser to the cmake build
->>>>>>> Add swift-argument-parser to the cmake build
         }
       },
       {

Package.swift

@@ -74,19 +74,13 @@ if ProcessInfo.processInfo.environment["SWIFT_DRIVER_LLBUILD_FWK"] == nil {
 if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
   package.dependencies += [
     .package(url: "https://github.com/apple/swift-tools-support-core.git", .branch("master")),
-<<<<<<< HEAD
     .package(url: "https://github.com/jpsim/Yams.git", .upToNextMinor(from: "4.0.0")),
     .package(url: "https://github.com/apple/swift-argument-parser.git", .exact("0.3.0"))
-=======
-    .package(url: "https://github.com/jpsim/Yams.git", .branch("master")),
-    .package(url: "https://github.com/apple/swift-argument-parser.git", .exact("0.0.6"))
->>>>>>> Add swift-argument-parser to the cmake build
     ]
 } else {
     package.dependencies += [
         .package(path: "../swiftpm/swift-tools-support-core"),
         .package(path: "../yams"),
-        .package(path: "../llbuild"),
         .package(path: "../swift-argument-parser"),
     ]
 }

Sources/swift-help/main.swift

@@ -16,18 +16,18 @@ extension DriverKind: ExpressibleByArgument {}
 
 struct SwiftHelp: ParsableCommand {
   @ArgumentParser.Option(name: .customLong("tool", withSingleDash: true),
-                         default: .interactive,
                          help: "The tool to list options of")
-  var tool: DriverKind
+  var tool: DriverKind = .interactive
 
   @Flag(name: .customLong("show-hidden", withSingleDash: true),
         help: "List hidden (unsupported) options")
-  var showHidden: Bool
+  var showHidden: Bool = false
 
   func run() throws {
     let driverOptionTable = OptionTable()
     driverOptionTable.printHelp(driverKind: tool, includeHidden: showHidden)
   }
 }
 
+// SwiftPM executables don't support @main.
 SwiftHelp.main()