Merge pull request #2173 from practicalswift/arrows-second-try

Author: swift-ci

benchmark/single-source/CaptureProp.swift

@@ -17,7 +17,7 @@ func sum(_ x:Int, y:Int) -> Int {
 @inline(never)
 func benchCaptureProp<S : Sequence
 >(
-  _ s: S, _ f:(S.Iterator.Element, S.Iterator.Element)->S.Iterator.Element) -> S.Iterator.Element {
+  _ s: S, _ f: (S.Iterator.Element, S.Iterator.Element) -> S.Iterator.Element) -> S.Iterator.Element {
 
   var it = s.makeIterator()
   let initial = it.next()!

benchmark/single-source/Integrate.swift

@@ -18,13 +18,13 @@ import TestsUtils
 class Integrate {
   static let epsilon = 1.0e-9;
 
-  let fun:(Double)->Double;
+  let fun: (Double) -> Double;
 
-  init (f:(Double)->Double) {
+  init (f: (Double) -> Double) {
     fun = f;
   }
 
-  private func recEval(_ l:Double, fl:Double, r:Double, fr:Double, a:Double)->Double {
+  private func recEval(_ l: Double, fl: Double, r: Double, fr: Double, a: Double) -> Double {
     let h = (r - l) / 2
     let hh = h / 2
     let c = l + h
@@ -43,7 +43,7 @@ class Integrate {
   }
 
   @inline(never)
-  func computeArea(_ left: Double, right:Double)->Double {
+  func computeArea(_ left: Double, right: Double) -> Double {
     return recEval(left, fl:fun(left), r:right, fr:fun(right), a:0)
   }
 }

benchmark/single-source/Prims.swift

@@ -183,7 +183,7 @@ extension Edge : Hashable {
   }
 }
 
-func Prims(_ graph : Array<GraphNode>, _ fun : (Int, Int)->Double) -> Array<Int?> {
+func Prims(_ graph : Array<GraphNode>, _ fun : (Int, Int) -> Double) -> Array<Int?> {
   var treeEdges = Array<Int?>(repeating:nil, count:graph.count)
 
   let queue = PriorityQueue(Num:graph.count)

benchmark/utils/DriverUtils.swift

@@ -48,18 +48,18 @@ extension BenchResults : CustomStringConvertible {
 struct Test {
   let name: String
   let index: Int
-  let f: (Int)->()
+  let f: (Int) -> ()
   var run: Bool
-  init(name: String, n: Int, f: (Int)->()) {
+  init(name: String, n: Int, f: (Int) -> ()) {
     self.name = name
     self.index = n
     self.f = f
     run = true
   }
 }
 
-public var precommitTests: [String : (Int)->()] = [:]
-public var otherTests: [String : (Int)->()] = [:]
+public var precommitTests: [String : (Int) -> ()] = [:]
+public var otherTests: [String : (Int) -> ()] = [:]
 
 enum TestAction {
   case Run

stdlib/private/StdlibUnittest/StdlibUnittest.swift.gyb

@@ -182,7 +182,7 @@ public func expectNotEqual<T : Equatable>(_ expected: T, _ actual: T, ${TRACE})
 }
 
 // Cannot write a sane set of overloads using generics because of:
-// <rdar://problem/17015923> Array->NSArray implicit conversion insanity
+// <rdar://problem/17015923> Array -> NSArray implicit conversion insanity
 public func expectOptionalEqual<T : Equatable>(
   _ expected: T, _ actual: T?, ${TRACE}
 ) {

stdlib/public/core/Print.swift

@@ -31,7 +31,7 @@ public func print(
 #if os(Windows)
   // FIXME: This fix is for 'crash at hook(output.left)' in cygwin.
   //        Proper fix is needed. see: https://bugs.swift.org/browse/SR-612
-  let _playgroundPrintHook: ((String)->Void)? = nil
+  let _playgroundPrintHook: ((String) -> Void)? = nil
 #endif
   if let hook = _playgroundPrintHook {
     var output = _TeeStream(left: "", right: _Stdout())

test/1_stdlib/NewArray.swift.gyb

@@ -144,7 +144,7 @@ func test<
   checkEqual(x, y, false)
 
   func checkReallocations(
-    _ a: T, _ growthDescription: String, _ growBy1: (_: inout T)->()
+    _ a: T, _ growthDescription: String, _ growBy1: (_: inout T) -> ()
   ) {
     var a = a
     var reallocations = 0

test/1_stdlib/Tuple.swift.gyb

@@ -20,7 +20,7 @@ var TupleTestSuite = TestSuite("Tuple")
 func testEquality<A : Equatable, B : Equatable, C : Equatable>(
   _ lhs: (A, B, C), equal: Bool, to rhs: (A, B, C),
   //===--- TRACE boilerplate ----------------------------------------------===//
-  @autoclosure _ message: ()->String = "",
+  @autoclosure _ message: () -> String = "",
   showFrame: Bool = true,
   stackTrace: SourceLocStack = SourceLocStack(),  
   file: String = #file, line: UInt = #line
@@ -94,7 +94,7 @@ enum Ordering : Equatable {
 func testOrdering<A : Comparable, B : Comparable, C : Comparable>(
   _ lhs: (A, B, C), _ ordering: Ordering, _ rhs: (A, B, C),
   //===--- TRACE boilerplate ----------------------------------------------===//
-  @autoclosure _ message: ()->String = "",
+  @autoclosure _ message: () -> String = "",
   showFrame: Bool = true,
   stackTrace: SourceLocStack = SourceLocStack(),  
   file: String = #file, line: UInt = #line

test/Constraints/diagnostics.swift

@@ -147,7 +147,7 @@ public func myMap<C : Collection, T>(
 }
 
 @available(*, unavailable, message: "call the 'map()' method on the optional value")
-public func myMap<T, U>(_ x: T?, @noescape _ f: (T)->U) -> U? {
+public func myMap<T, U>(_ x: T?, @noescape _ f: (T) -> U) -> U? {
   fatalError("unavailable function can't be called")
 }
 

test/Prototypes/CollectionsMoveIndices.swift

@@ -324,7 +324,7 @@
 // a small number of commonly used algorithms that require that
 // property, and they can be provided as methods on the collection,
 // for example removeAll(in: Range<Index>) and
-// removeAll(_: (Element)->Bool).
+// removeAll(_: (Element) -> Bool).
 //
 // If we were to allow reference-counted indices (basically, the
 // current collections model), then an additional design is possible