Merge pull request #577 from milseman/noescape_by_default

[noescape by default] Add explicit @escaping as needed

Author: milseman

Sources/Basic/OptionParser.swift

@@ -47,7 +47,7 @@ public protocol Argument {
      associated value we will throw. If the argument was
      passed `--foo=bar` and you don’t `pop` we also `throw`
     */
-    init?(argument: String, pop: () -> String?) throws
+    init?(argument: String, pop: @escaping () -> String?) throws
 }
 
 public func parseOptions<Mode: Argument, Flag: Argument>(arguments: [String]) throws -> (Mode?, [Flag]) where Mode: Equatable {

Sources/Commands/SwiftBuildTool.swift

@@ -32,7 +32,7 @@ private enum Mode: Argument, Equatable, CustomStringConvertible {
     case usage
     case version
 
-    init?(argument: String, pop: () -> String?) throws {
+    init?(argument: String, pop: @escaping () -> String?) throws {
         switch argument {
         case "--configuration", "--config", "-c":
             self = try .build(Configuration(pop()), UserToolchain())

Sources/Commands/SwiftPackageTool.swift

@@ -37,7 +37,7 @@ private enum Mode: Argument, Equatable, CustomStringConvertible {
     case usage
     case version
 
-    init?(argument: String, pop: () -> String?) throws {
+    init?(argument: String, pop: @escaping () -> String?) throws {
         switch argument {
         case "dump-package":
             self = .dumpPackage

Sources/Commands/SwiftTestTool.swift

@@ -46,7 +46,7 @@ private enum Mode: Argument, Equatable, CustomStringConvertible {
     case listTests
     case run(String?)
 
-    init?(argument: String, pop: () -> String?) throws {
+    init?(argument: String, pop: @escaping () -> String?) throws {
         switch argument {
         case "--help", "-h":
             self = .usage

Tests/BasicTests/OptionParserTests.swift

@@ -141,7 +141,7 @@ class OptionParserTests: XCTestCase {
 enum Mode: String, Argument {
     case A, B, C
 
-    init?(argument: String, pop: () -> String?) throws {
+    init?(argument: String, pop: @escaping () -> String?) throws {
         switch argument {
         case "--A":
             self = .A
@@ -158,7 +158,7 @@ enum Mode: String, Argument {
 enum Flag: Argument, Equatable {
     case D, E, F(String), G(Int), H, I, J, K(String)
 
-    init?(argument: String, pop: () -> String?) throws {
+    init?(argument: String, pop: @escaping () -> String?) throws {
         switch argument {
         case "--D":
             self = .D