Account for flatMap changes

Author: airspeedswift

stdlib/public/core/SequenceAlgorithms.swift.gyb

@@ -725,7 +725,7 @@ extension Sequence {
   // overloads.
   @inline(__always)
   public func _flatMap<ElementOfResult>(
-    _ transform: (${GElement}) throws -> ElementOfResult?
+    _ transform: (Element) throws -> ElementOfResult?
   ) rethrows -> [ElementOfResult] {
     var result: [ElementOfResult] = []
     for element in self {

stdlib/public/core/StringRangeReplaceableCollection.swift.gyb

@@ -41,7 +41,7 @@ extension String : StringProtocol {
   // and disambiguates between the following intitializers, now that String
   // conforms to Collection:
   // - init<T>(_ value: T) where T : LosslessStringConvertible
-  // - init<S>(_ characters: S) where S : Sequence, S.Iterator.Element == Character
+  // - init<S>(_ characters: S) where S : Sequence, S.Element == Character
   public init(_ other: String) {
     self.init(other._core)
   }
@@ -395,15 +395,15 @@ extension String {
 extension Sequence {
   @available(swift, obsoleted: 4)
   public func flatMap(
-    _ transform: (Iterator.Element) throws -> String
+    _ transform: (Element) throws -> String
   ) rethrows -> [String] {
     return try map(transform)
   }
 }
 
 extension Collection {
   public func flatMap(
-    _ transform: (Iterator.Element) throws -> String?
+    _ transform: (Element) throws -> String?
   ) rethrows -> [String] {
     return try _flatMap(transform)
   }