first(predicate) => first(where: predicate); contains(predicate) => contains(elementWhere: predicate)

Author: Dave Abrahams

stdlib/public/core/FloatingPointParsing.swift.gyb

@@ -66,7 +66,7 @@ extension ${Self} {
     let (result, n) = text.withCString(invoke: parseNTBS)
 
     if n == 0 || n != u16.count
-      || u16.contains({ $0 > 127 || _isspace_clocale($0) }) {
+    || u16.contains(elementWhere: { $0 > 127 || _isspace_clocale($0) }) {
       return nil
     }
     self = result

stdlib/public/core/Sequence.swift

@@ -561,12 +561,12 @@ public protocol Sequence {
   /// Returns the first element of the sequence that satisfies the given
   /// predicate or nil if no such element is found.
   ///
-  /// - Parameter where: A closure that takes an element of the
+  /// - Parameter predicate: A closure that takes an element of the
   ///   sequence as its argument and returns a Boolean value indicating
   ///   whether the element is a match.
   /// - Returns: The first match or `nil` if there was no match.
   func first(
-    where: @noescape (Iterator.Element) throws -> Bool
+    where predicate: @noescape (Iterator.Element) throws -> Bool
   ) rethrows -> Iterator.Element?
 
   func _customContainsEquatableElement(
@@ -966,7 +966,7 @@ extension Sequence {
   /// Returns the first element of the sequence that satisfies the given
   /// predicate or nil if no such element is found.
   ///
-  /// - Parameter where: A closure that takes an element of the
+  /// - Parameter predicate: A closure that takes an element of the
   ///   sequence as its argument and returns a Boolean value indicating
   ///   whether the element is a match.
   /// - Returns: The first match or `nil` if there was no match.

stdlib/public/core/SequenceAlgorithms.swift.gyb

@@ -503,7 +503,7 @@ extension Sequence {
   /// - Returns: `true` if the sequence contains an element that satisfies
   ///   `predicate`; otherwise, `false`.
   public func contains(
-    _ predicate: @noescape (${GElement}) throws -> Bool
+    elementWhere predicate: @noescape (${GElement}) throws -> Bool
   ) rethrows -> Bool {
     for e in self {
       if try predicate(e) {

validation-test/stdlib/AtomicInt.swift

@@ -725,7 +725,7 @@ struct AtomicInitializeARCRefRaceTest : RaceTestWithPerTrialData {
     _ raceData: RaceData, _ threadLocalData: inout ThreadLocalData
   ) -> Observation {
     var observation = Observation4UInt(0, 0, 0, 0)
-    var initializerDestroyed = HeapBool(false)
+    let initializerDestroyed = HeapBool(false)
     do {
       let initializer = DummyObject(
         destroyedFlag: initializerDestroyed,
@@ -749,13 +749,13 @@ struct AtomicInitializeARCRefRaceTest : RaceTestWithPerTrialData {
     _ sink: (RaceTestObservationEvaluation) -> Void
   ) {
     let ref = observations[0].data2
-    if observations.contains({ $0.data2 != ref }) {
+    if observations.contains(elementWhere: { $0.data2 != ref }) {
       for observation in observations {
         sink(.failureInteresting("mismatched reference, expected \(ref): \(observation)"))
       }
       return
     }
-    if observations.contains({ $0.data3 != 0x12345678 }) {
+    if observations.contains(elementWhere: { $0.data3 != 0x12345678 }) {
       for observation in observations {
         sink(.failureInteresting("wrong data: \(observation)"))
       }