swift4: fully list closure arguments

Author: spevans

Diff for: Foundation/NSArray.swift

@@ -381,7 +381,7 @@ open class NSArray : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NSCo
                 ptr.advanced(by: idx).pointee = Int32(hash).littleEndian
             }
         }
-        return Data(bytesNoCopy: buffer, count: size, deallocator: .custom({ _ in
+        return Data(bytesNoCopy: buffer, count: size, deallocator: .custom({ (_, _) in
             buffer.deallocate(capacity: size)
         }))
     }

Diff for: Foundation/NSError.swift

@@ -70,11 +70,11 @@ open class NSError : NSObject, NSCopying, NSSecureCoding, NSCoding {
         if let info = aDecoder.decodeObject(of: [NSSet.self, NSDictionary.self, NSArray.self, NSString.self, NSNumber.self, NSData.self, NSURL.self], forKey: "NSUserInfo") as? NSDictionary {
             var filteredUserInfo = [String : Any]()
             // user info must be filtered so that the keys are all strings
-            info.enumerateKeysAndObjects(options: []) {
-                if let key = $0.0 as? NSString {
-                    filteredUserInfo[key._swiftObject] = $0.1
+            info.enumerateKeysAndObjects({ (key, value, _) in
+                if let key = key as? NSString {
+                    filteredUserInfo[key._swiftObject] = value
                 }
-            }
+            })
             _userInfo = filteredUserInfo
         }
     }

Diff for: Foundation/NSIndexSet.swift

@@ -93,8 +93,8 @@ open class NSIndexSet : NSObject, NSCopying, NSMutableCopying, NSSecureCoding {
 
     open func mutableCopy(with zone: NSZone? = nil) -> Any {
         let set = NSMutableIndexSet()
-        enumerateRanges(options: []) {
-            set.add(in: $0.0)
+        enumerateRanges(options: []) { (range, _) in
+            set.add(in: range)
         }
         return set
     }

Diff for: Foundation/NSNotificationQueue.swift

@@ -109,16 +109,16 @@ open class NotificationQueue: NSObject {
         var predicate: (NSNotificationListEntry) -> Bool
         switch coalesceMask {
         case [.onName, .onSender]:
-            predicate = { (entryNotification, _) in
-                return _SwiftValue.store(notification.object) !== _SwiftValue.store(entryNotification.object) || notification.name != entryNotification.name
+            predicate = { entry in
+                return _SwiftValue.store(notification.object) !== _SwiftValue.store(entry.0.object) || notification.name != entry.0.name
             }
         case [.onName]:
-            predicate = { (entryNotification, _) in
-                return notification.name != entryNotification.name
+            predicate = { entry in
+                return notification.name != entry.0.name
             }
         case [.onSender]:
-            predicate = { (entryNotification, _) in
-                return _SwiftValue.store(notification.object) !== _SwiftValue.store(entryNotification.object)
+            predicate = { entry in
+                return _SwiftValue.store(notification.object) !== _SwiftValue.store(entry.0.object)
             }
         default:
             return

Diff for: Foundation/NSXMLNode.swift

@@ -617,8 +617,8 @@ open class XMLNode: NSObject, NSCopying {
             if let parentNode = _CFXMLNodeGetParent(parent!) {
                 let grandparent = XMLNode._objectNodeForNode(parentNode)
                 let possibleParentNodes = grandparent.filter { $0.name == self.parent?.name }
-                let count = possibleParentNodes.reduce(0) {
-                    return $0.0 + 1
+                let count = possibleParentNodes.reduce(0) { (x, _) in
+                    return x + 1
                 }
 
                 if count <= 1 {

Diff for: TestFoundation/TestNSCompoundPredicate.swift

@@ -92,7 +92,7 @@ class TestNSCompoundPredicate: XCTestCase {
         var shortCircuited = true
 
         let bOK = NSPredicate(value: false)
-        let bDontEval = NSPredicate(block: { _ in
+        let bDontEval = NSPredicate(block: { (_, _) in
             shortCircuited = false
             return true
         })
@@ -106,7 +106,7 @@ class TestNSCompoundPredicate: XCTestCase {
         var shortCircuited = true
 
         let bOK = NSPredicate(value: true)
-        let bDontEval = NSPredicate(block: { _ in
+        let bDontEval = NSPredicate(block: { (_, _) in
             shortCircuited = false
             return true
         })

Diff for: TestFoundation/TestNSURLSession.swift

@@ -193,7 +193,7 @@ class TestURLSession : XCTestCase {
         let session = URLSession(configuration: URLSessionConfiguration.default,
                                  delegate: delegate, delegateQueue: nil)
         let completionExpectation = expectation(description: "dataTask completion block wasn't called")
-        let task = session.dataTask(with: url) { _ in
+        let task = session.dataTask(with: url) { (_, _, _) in
             completionExpectation.fulfill()
         }
         task.resume()
@@ -207,9 +207,8 @@ class TestURLSession : XCTestCase {
                                  delegate: nil,
                                  delegateQueue: nil)
         let completionExpectation = expectation(description: "dataTask completion block wasn't called")
-        let task = session.dataTask(with: url) { result in
-            let error = result.2 as? URLError
-            
+        let task = session.dataTask(with: url) { (_, _, result) in
+            let error = result as? URLError
             XCTAssertNotNil(error)
             XCTAssertEqual(error?.code, .badURL)
             completionExpectation.fulfill()