Merge pull request #14605 from moiseev/flatmap-versioned-deprecation

[stdlib] Only deprecate flatMap starting with Swift 4.1

Author: moiseev

stdlib/public/core/FlatMap.swift

@@ -60,7 +60,7 @@ extension LazySequenceProtocol {
   ///
   /// - Complexity: O(1)
   @inline(__always)
-  @available(*, deprecated, renamed: "compactMap(_:)",
+  @available(swift, deprecated: 4.1, renamed: "compactMap(_:)",
     message: "Please use compactMap(_:) for the case where closure returns an optional value")
   public func flatMap<ElementOfResult>(
     _ transform: @escaping (Elements.Element) -> ElementOfResult?
@@ -124,7 +124,7 @@ extension LazyCollectionProtocol {
   ///   collection as its argument and returns an optional value.
   ///
   /// - Complexity: O(1)
-  @available(*, deprecated, renamed: "compactMap(_:)",
+  @available(swift, deprecated: 4.1, renamed: "compactMap(_:)",
     message: "Please use compactMap(_:) for the case where closure returns an optional value")
   @_inlineable // FIXME(sil-serialize-all)
   public func flatMap<ElementOfResult>(

stdlib/public/core/SequenceAlgorithms.swift.gyb

@@ -783,7 +783,7 @@ extension Sequence {
   /// - Complexity: O(*m* + *n*), where *m* is the length of this sequence
   ///   and *n* is the length of the result.
   @inline(__always)
-  @available(*, deprecated, renamed: "compactMap(_:)",
+  @available(swift, deprecated: 4.1, renamed: "compactMap(_:)",
     message: "Please use compactMap(_:) for the case where closure returns an optional value")
   public func flatMap<ElementOfResult>(
     _ transform: (Element) throws -> ElementOfResult?

stdlib/public/core/StringRangeReplaceableCollection.swift.gyb

@@ -581,7 +581,7 @@ extension Collection {
     return try _compactMap(transform)
   }
 
-  @available(*, deprecated, renamed: "compactMap(_:)",
+  @available(swift, deprecated: 4.1, renamed: "compactMap(_:)",
     message: "Please use compactMap(_:) for the case where closure returns an optional value")
   @inline(__always)
   public func flatMap(

test/stdlib/FlatMapDeprecation.swift

@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift %s
+// RUN: %swift -swift-version 4 -typecheck -verify  %s
 
 func flatMapOnSequence<
   S : Sequence