Adjustments for SE-0118

https://github.com/apple/swift-evolution/blob/master/proposals/0118-closure-parameter-names-and-labels.md

Author: Dave Abrahams

Foundation/NSCompoundPredicate.swift

@@ -48,11 +48,11 @@ public class CompoundPredicate : Predicate {
     override public func evaluate(with object: AnyObject?, substitutionVariables bindings: [String : AnyObject]?) -> Bool {
         switch compoundPredicateType {
         case .and:
-            return subpredicates.reduce(true, combine: {
+            return subpredicates.reduce(true, {
                 $0 && $1.evaluate(with: object, substitutionVariables: bindings)
             })
         case .or:
-            return subpredicates.reduce(false, combine: {
+            return subpredicates.reduce(false, {
                 $0 || $1.evaluate(with: object, substitutionVariables: bindings)
             })
         case .not:

Foundation/NSKeyedArchiver.swift

@@ -632,14 +632,14 @@ public class NSKeyedArchiver : NSCoder {
     }
 
     public override func encodePropertyList(_ aPropertyList: AnyObject) {
-        if !NSPropertyListClasses.contains({ $0 == aPropertyList.dynamicType }) {
+        if !NSPropertyListClasses.contains(where: { $0 == aPropertyList.dynamicType }) {
             fatalError("Cannot encode non-property list type \(aPropertyList.dynamicType) as property list")
         }
         encode(aPropertyList)
     }
 
     public func encodePropertyList(_ aPropertyList: AnyObject, forKey key: String) {
-        if !NSPropertyListClasses.contains({ $0 == aPropertyList.dynamicType }) {
+        if !NSPropertyListClasses.contains(where: { $0 == aPropertyList.dynamicType }) {
             fatalError("Cannot encode non-property list type \(aPropertyList.dynamicType) as property list")
         }
         encode(aPropertyList, forKey: key)

Foundation/NSKeyedUnarchiver.swift

@@ -242,7 +242,7 @@ public class NSKeyedUnarchiver : NSCoder {
 
         if _flags.contains(UnarchiverFlags.RequiresSecureCoding) {
             if let unwrappedAllowedClasses = allowedClasses {
-                if unwrappedAllowedClasses.contains({NSKeyedUnarchiver._classIsKindOfClass(assertedClass!, $0)}) {
+                if unwrappedAllowedClasses.contains(where: {NSKeyedUnarchiver._classIsKindOfClass(assertedClass!, $0)}) {
                     return true
                 }
             }

TestFoundation/TestNSString.swift

@@ -1092,10 +1092,10 @@ func checkHasPrefixHasSuffix(_ lhs: String, _ rhs: String, _ stack: [UInt]) -> I
             Array(String($0).unicodeScalars)
     }
     let expectHasPrefix = lhsNFDGraphemeClusters.starts(
-        with: rhsNFDGraphemeClusters, isEquivalent: (==))
+        with: rhsNFDGraphemeClusters, by: (==))
     let expectHasSuffix =
         lhsNFDGraphemeClusters.lazy.reversed().starts(
-            with: rhsNFDGraphemeClusters.lazy.reversed(), isEquivalent: (==))
+            with: rhsNFDGraphemeClusters.lazy.reversed(), by: (==))
 
     func testFailure(_ lhs: Bool, _ rhs: Bool, _ stack: [UInt]) -> Int {
         guard lhs == rhs else {