Skip to content

Commit 1f0a62a

Browse files
committed
Update swift-argument-parser to 0.3.0
1 parent a86a5e0 commit 1f0a62a

File tree

3 files changed

+3
-21
lines changed

3 files changed

+3
-21
lines changed

Package.resolved

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,9 @@
55
"package": "swift-argument-parser",
66
"repositoryURL": "https://github.com/apple/swift-argument-parser.git",
77
"state": {
8-
<<<<<<< HEAD
98
"branch": null,
109
"revision": "15351c1cd009eba0b6e438bfef55ea9847a8dc4a",
1110
"version": "0.3.0"
12-
=======
13-
<<<<<<< HEAD
14-
"branch": "master",
15-
"revision": "15351c1cd009eba0b6e438bfef55ea9847a8dc4a",
16-
"version": null
17-
=======
18-
"branch": null,
19-
"revision": "223d62adc52d51669ae2ee19bdb8b7d9fd6fcd9c",
20-
"version": "0.0.6"
21-
>>>>>>> Add swift-argument-parser to the cmake build
22-
>>>>>>> Add swift-argument-parser to the cmake build
2311
}
2412
},
2513
{

Package.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,13 @@ if ProcessInfo.processInfo.environment["SWIFT_DRIVER_LLBUILD_FWK"] == nil {
7474
if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
7575
package.dependencies += [
7676
.package(url: "https://github.com/apple/swift-tools-support-core.git", .branch("master")),
77-
<<<<<<< HEAD
7877
.package(url: "https://github.com/jpsim/Yams.git", .upToNextMinor(from: "4.0.0")),
7978
.package(url: "https://github.com/apple/swift-argument-parser.git", .exact("0.3.0"))
80-
=======
81-
.package(url: "https://github.com/jpsim/Yams.git", .branch("master")),
82-
.package(url: "https://github.com/apple/swift-argument-parser.git", .exact("0.0.6"))
83-
>>>>>>> Add swift-argument-parser to the cmake build
8479
]
8580
} else {
8681
package.dependencies += [
8782
.package(path: "../swiftpm/swift-tools-support-core"),
8883
.package(path: "../yams"),
89-
.package(path: "../llbuild"),
9084
.package(path: "../swift-argument-parser"),
9185
]
9286
}

Sources/swift-help/main.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ extension DriverKind: ExpressibleByArgument {}
1616

1717
struct SwiftHelp: ParsableCommand {
1818
@ArgumentParser.Option(name: .customLong("tool", withSingleDash: true),
19-
default: .interactive,
2019
help: "The tool to list options of")
21-
var tool: DriverKind
20+
var tool: DriverKind = .interactive
2221

2322
@Flag(name: .customLong("show-hidden", withSingleDash: true),
2423
help: "List hidden (unsupported) options")
25-
var showHidden: Bool
24+
var showHidden: Bool = false
2625

2726
func run() throws {
2827
let driverOptionTable = OptionTable()
2928
driverOptionTable.printHelp(driverKind: tool, includeHidden: showHidden)
3029
}
3130
}
3231

32+
// SwiftPM executables don't support @main.
3333
SwiftHelp.main()

0 commit comments

Comments
 (0)