[SE-0270] Reset availability of RangeSet APIs (swiftlang#34567)

benrimmington · web-flow · commit 824e4d0cad00 · 2020-11-04T16:49:18.000-06:00
diff --git a/stdlib/public/core/CollectionAlgorithms.swift b/stdlib/public/core/CollectionAlgorithms.swift
@@ -231,7 +231,7 @@ extension Collection {
   ///   returns `true`.
   ///
   /// - Complexity: O(*n*), where *n* is the length of the collection.
-  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+  @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
   public func subranges(where predicate: (Element) throws -> Bool) rethrows
     -> RangeSet<Index>
   {
@@ -267,7 +267,7 @@ extension Collection where Element: Equatable {
   ///   `element`.
   ///
   /// - Complexity: O(*n*), where *n* is the length of the collection.
-  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+  @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
   public func subranges(of element: Element) -> RangeSet<Index> {
     subranges(where: { $0 == element })
   }
diff --git a/stdlib/public/core/DiscontiguousSlice.swift b/stdlib/public/core/DiscontiguousSlice.swift
@@ -12,7 +12,7 @@
 
 /// A collection wrapper that provides access to the elements of a collection,
 /// indexed by a set of indices.
-@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 @frozen
 public struct DiscontiguousSlice<Base: Collection> {
   /// The collection that the indexed collection wraps.
@@ -22,7 +22,7 @@ public struct DiscontiguousSlice<Base: Collection> {
   public var subranges: RangeSet<Base.Index>
 }
 
-@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension DiscontiguousSlice {
   /// A position in an `DiscontiguousSlice`.
   @frozen
@@ -39,10 +39,10 @@ extension DiscontiguousSlice {
   }
 }
 
-@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension DiscontiguousSlice.Index: Hashable where Base.Index: Hashable {}
 
-@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension DiscontiguousSlice: Collection {
   public typealias SubSequence = Self
   
@@ -83,7 +83,7 @@ extension DiscontiguousSlice: Collection {
   }
 }
 
-@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension DiscontiguousSlice {
   public var count: Int {
     var c = 0
@@ -102,7 +102,7 @@ extension DiscontiguousSlice {
   }
 }
 
-@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension DiscontiguousSlice: BidirectionalCollection
   where Base: BidirectionalCollection
 {
@@ -122,7 +122,7 @@ extension DiscontiguousSlice: BidirectionalCollection
   }
 }
 
-@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension DiscontiguousSlice: MutableCollection where Base: MutableCollection {
   public subscript(i: Index) -> Base.Element {
     get {
@@ -145,7 +145,7 @@ extension Collection {
   /// - Returns: A collection of the elements at the positions in `subranges`.
   ///
   /// - Complexity: O(1)
-  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+  @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
   public subscript(subranges: RangeSet<Index>) -> DiscontiguousSlice<Self> {
     DiscontiguousSlice(base: self, subranges: subranges)
   }
@@ -162,7 +162,7 @@ extension MutableCollection {
   /// - Complexity: O(1) to access the elements, O(*m*) to mutate the
   ///   elements at the positions in `subranges`, where *m* is the number of
   ///   elements indicated by `subranges`.
-  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+  @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
   public subscript(subranges: RangeSet<Index>) -> DiscontiguousSlice<Self> {
     get {
       DiscontiguousSlice(base: self, subranges: subranges)
@@ -196,7 +196,7 @@ extension Collection {
   /// - Returns: A collection of the elements that are not in `subranges`.
   ///
   /// - Complexity: O(*n*), where *n* is the length of the collection.
-  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+  @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
   public func removingSubranges(
     _ subranges: RangeSet<Index>
   ) -> DiscontiguousSlice<Self> {
diff --git a/stdlib/public/core/MutableCollection.swift b/stdlib/public/core/MutableCollection.swift
@@ -290,7 +290,7 @@ extension MutableCollection {
   /// - Returns: The new bounds of the moved elements.
   ///
   /// - Complexity: O(*n* log *n*) where *n* is the length of the collection.
-  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+  @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
   @discardableResult
   public mutating func moveSubranges(
     _ subranges: RangeSet<Index>, to insertionPoint: Index
diff --git a/stdlib/public/core/RangeReplaceableCollection.swift b/stdlib/public/core/RangeReplaceableCollection.swift
@@ -1178,7 +1178,7 @@ extension RangeReplaceableCollection {
   /// - Parameter subranges: The indices of the elements to remove.
   ///
   /// - Complexity: O(*n*), where *n* is the length of the collection.
-  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+  @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
   public mutating func removeSubranges(_ subranges: RangeSet<Index>) {
     guard !subranges.isEmpty else {
       return
@@ -1208,7 +1208,7 @@ extension MutableCollection where Self: RangeReplaceableCollection {
   /// - Parameter subranges: The indices of the elements to remove.
   ///
   /// - Complexity: O(*n*), where *n* is the length of the collection.
-  @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+  @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
   public mutating func removeSubranges(_ subranges: RangeSet<Index>) {
     guard let firstRange = subranges.ranges.first else {
       return
diff --git a/stdlib/public/core/RangeSet.swift b/stdlib/public/core/RangeSet.swift
@@ -26,7 +26,7 @@
 ///
 ///     numbers.moveSubranges(negativeSubranges, to: 0)
 ///     // numbers == [-5, -3, -9, 10, 12, 14, 15]
-@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 public struct RangeSet<Bound: Comparable> {
   internal var _ranges = _RangeSetStorage<Bound>()
 
@@ -238,15 +238,15 @@ public struct RangeSet<Bound: Comparable> {
   }
 }
 
-@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension RangeSet: Equatable {}
 
-@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension RangeSet: Hashable where Bound: Hashable {}
 
 // MARK: - Range Collection
 
-@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension RangeSet {
   /// A collection of the ranges that make up a range set.
   public struct Ranges: RandomAccessCollection {
@@ -271,7 +271,7 @@ extension RangeSet {
 
 // MARK: - Collection APIs
 
-@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension RangeSet {
   /// Creates a new range set containing ranges that contain only the
   /// specified indices in the given collection.
@@ -365,7 +365,7 @@ extension RangeSet {
 
 // These methods only depend on the ranges that comprise the range set, so
 // we can provide them even when we can't provide `SetAlgebra` conformance.
-@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension RangeSet {
   /// Adds the contents of the given range set to this range set.
   ///
@@ -549,7 +549,7 @@ extension RangeSet {
   }
 }
 
-@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension RangeSet: CustomStringConvertible {
   public var description: String {
     let rangesDescription = _ranges
diff --git a/validation-test/StdlibUnittest/RangeSet.swift b/validation-test/StdlibUnittest/RangeSet.swift
@@ -4,7 +4,7 @@
 import StdlibUnittest
 import StdlibCollectionUnittest
 
-@available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+@available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
 extension RangeSet: ExpressibleByArrayLiteral {
   public init(arrayLiteral elements: Range<Bound>...) {
     self.init(elements)
@@ -21,7 +21,7 @@ extension Collection {
 
 let RangeSetTests = TestSuite("RangeSet")
 
-if #available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *) {
+if #available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *) {
   let parent = -200..<200
   let source: RangeSet = [1..<5, 8..<10, 20..<22, 27..<29]
 
