Merge pull request #39703 from DougGregor/revert-asyncsequence-operator-abi-break

swift-ci · web-flow · commit 865b7829bdfb · 2021-10-12T17:41:33.000-07:00
diff --git a/stdlib/public/Concurrency/AsyncCompactMapSequence.swift b/stdlib/public/Concurrency/AsyncCompactMapSequence.swift
@@ -56,15 +56,14 @@ extension AsyncSequence {
 /// An asynchronous sequence that maps a given closure over the asynchronous
 /// sequence’s elements, omitting results that don't return a value.
 @available(SwiftStdlib 5.5, *)
-@frozen
 public struct AsyncCompactMapSequence<Base: AsyncSequence, ElementOfResult> {
   @usableFromInline
   let base: Base
 
   @usableFromInline
   let transform: (Base.Element) async -> ElementOfResult?
 
-  @inlinable
+  @usableFromInline
   init(
     _ base: Base, 
     transform: @escaping (Base.Element) async -> ElementOfResult?
@@ -85,7 +84,6 @@ extension AsyncCompactMapSequence: AsyncSequence {
   public typealias AsyncIterator = Iterator
 
   /// The iterator that produces elements of the compact map sequence.
-  @frozen
   public struct Iterator: AsyncIteratorProtocol {
     public typealias Element = ElementOfResult
 
@@ -95,7 +93,7 @@ extension AsyncCompactMapSequence: AsyncSequence {
     @usableFromInline
     let transform: (Base.Element) async -> ElementOfResult?
 
-    @inlinable
+    @usableFromInline
     init(
       _ baseIterator: Base.AsyncIterator, 
       transform: @escaping (Base.Element) async -> ElementOfResult?
diff --git a/stdlib/public/Concurrency/AsyncDropFirstSequence.swift b/stdlib/public/Concurrency/AsyncDropFirstSequence.swift
@@ -49,15 +49,14 @@ extension AsyncSequence {
 /// An asynchronous sequence which omits a specified number of elements from the
 /// base asynchronous sequence, then passes through all remaining elements.
 @available(SwiftStdlib 5.5, *)
-@frozen
 public struct AsyncDropFirstSequence<Base: AsyncSequence> {
   @usableFromInline
   let base: Base
 
   @usableFromInline
   let count: Int
   
-  @inlinable 
+  @usableFromInline 
   init(_ base: Base, dropping count: Int) {
     self.base = base
     self.count = count
@@ -75,15 +74,14 @@ extension AsyncDropFirstSequence: AsyncSequence {
   public typealias AsyncIterator = Iterator
 
   /// The iterator that produces elements of the drop-first sequence.
-  @frozen
   public struct Iterator: AsyncIteratorProtocol {
     @usableFromInline
     var baseIterator: Base.AsyncIterator
     
     @usableFromInline
     var count: Int
 
-    @inlinable
+    @usableFromInline
     init(_ baseIterator: Base.AsyncIterator, count: Int) {
       self.baseIterator = baseIterator
       self.count = count
diff --git a/stdlib/public/Concurrency/AsyncDropWhileSequence.swift b/stdlib/public/Concurrency/AsyncDropWhileSequence.swift
@@ -53,15 +53,14 @@ extension AsyncSequence {
 /// given closure returns false, after which it passes through all remaining
 /// elements.
 @available(SwiftStdlib 5.5, *)
-@frozen
 public struct AsyncDropWhileSequence<Base: AsyncSequence> {
   @usableFromInline
   let base: Base
 
   @usableFromInline
   let predicate: (Base.Element) async -> Bool
 
-  @inlinable
+  @usableFromInline
   init(
     _ base: Base, 
     predicate: @escaping (Base.Element) async -> Bool
@@ -83,15 +82,14 @@ extension AsyncDropWhileSequence: AsyncSequence {
   public typealias AsyncIterator = Iterator
 
   /// The iterator that produces elements of the drop-while sequence.
-  @frozen
   public struct Iterator: AsyncIteratorProtocol {
     @usableFromInline
     var baseIterator: Base.AsyncIterator
 
     @usableFromInline
     var predicate: ((Base.Element) async -> Bool)?
 
-    @inlinable
+    @usableFromInline
     init(
       _ baseIterator: Base.AsyncIterator, 
       predicate: @escaping (Base.Element) async -> Bool
diff --git a/stdlib/public/Concurrency/AsyncFilterSequence.swift b/stdlib/public/Concurrency/AsyncFilterSequence.swift
@@ -44,15 +44,14 @@ extension AsyncSequence {
 /// An asynchronous sequence that contains, in order, the elements of
 /// the base sequence that satisfy a given predicate.
 @available(SwiftStdlib 5.5, *)
-@frozen
 public struct AsyncFilterSequence<Base: AsyncSequence> {
   @usableFromInline
   let base: Base
 
   @usableFromInline
   let isIncluded: (Element) async -> Bool
 
-  @inlinable
+  @usableFromInline
   init(
     _ base: Base, 
     isIncluded: @escaping (Base.Element) async -> Bool
@@ -73,15 +72,14 @@ extension AsyncFilterSequence: AsyncSequence {
   public typealias AsyncIterator = Iterator
 
   /// The iterator that produces elements of the filter sequence.
-  @frozen
   public struct Iterator: AsyncIteratorProtocol {
     @usableFromInline
     var baseIterator: Base.AsyncIterator
 
     @usableFromInline
     let isIncluded: (Base.Element) async -> Bool
 
-    @inlinable
+    @usableFromInline
     init(
       _ baseIterator: Base.AsyncIterator,
       isIncluded: @escaping (Base.Element) async -> Bool
diff --git a/stdlib/public/Concurrency/AsyncFlatMapSequence.swift b/stdlib/public/Concurrency/AsyncFlatMapSequence.swift
@@ -50,15 +50,14 @@ extension AsyncSequence {
 /// An asynchronous sequence that concatenates the results of calling a given
 /// transformation with each element of this sequence.
 @available(SwiftStdlib 5.5, *)
-@frozen
 public struct AsyncFlatMapSequence<Base: AsyncSequence, SegmentOfResult: AsyncSequence> {
   @usableFromInline
   let base: Base
 
   @usableFromInline
   let transform: (Base.Element) async -> SegmentOfResult
 
-  @inlinable
+  @usableFromInline
   init(
     _ base: Base,
     transform: @escaping (Base.Element) async -> SegmentOfResult
@@ -79,7 +78,6 @@ extension AsyncFlatMapSequence: AsyncSequence {
   public typealias AsyncIterator = Iterator
 
   /// The iterator that produces elements of the flat map sequence.
-  @frozen
   public struct Iterator: AsyncIteratorProtocol {
     @usableFromInline
     var baseIterator: Base.AsyncIterator
@@ -93,7 +91,7 @@ extension AsyncFlatMapSequence: AsyncSequence {
     @usableFromInline
     var finished = false
 
-    @inlinable
+    @usableFromInline
     init(
       _ baseIterator: Base.AsyncIterator,
       transform: @escaping (Base.Element) async -> SegmentOfResult
diff --git a/stdlib/public/Concurrency/AsyncMapSequence.swift b/stdlib/public/Concurrency/AsyncMapSequence.swift
@@ -54,15 +54,14 @@ extension AsyncSequence {
 /// An asynchronous sequence that maps the given closure over the asynchronous
 /// sequence’s elements.
 @available(SwiftStdlib 5.5, *)
-@frozen
 public struct AsyncMapSequence<Base: AsyncSequence, Transformed> {
   @usableFromInline
   let base: Base
 
   @usableFromInline
   let transform: (Base.Element) async -> Transformed
 
-  @inlinable
+  @usableFromInline
   init(
     _ base: Base, 
     transform: @escaping (Base.Element) async -> Transformed
@@ -83,15 +82,14 @@ extension AsyncMapSequence: AsyncSequence {
   public typealias AsyncIterator = Iterator
 
   /// The iterator that produces elements of the map sequence.
-  @frozen
   public struct Iterator: AsyncIteratorProtocol {
     @usableFromInline
     var baseIterator: Base.AsyncIterator
 
     @usableFromInline
     let transform: (Base.Element) async -> Transformed
 
-    @inlinable
+    @usableFromInline
     init(
       _ baseIterator: Base.AsyncIterator, 
       transform: @escaping (Base.Element) async -> Transformed
diff --git a/stdlib/public/Concurrency/AsyncPrefixSequence.swift b/stdlib/public/Concurrency/AsyncPrefixSequence.swift
@@ -49,15 +49,14 @@ extension AsyncSequence {
 /// An asynchronous sequence, up to a specified maximum length,
 /// containing the initial elements of a base asynchronous sequence.
 @available(SwiftStdlib 5.5, *)
-@frozen
 public struct AsyncPrefixSequence<Base: AsyncSequence> {
   @usableFromInline
   let base: Base
 
   @usableFromInline
   let count: Int
 
-  @inlinable
+  @usableFromInline
   init(_ base: Base, count: Int) {
     self.base = base
     self.count = count
@@ -75,15 +74,14 @@ extension AsyncPrefixSequence: AsyncSequence {
   public typealias AsyncIterator = Iterator
 
   /// The iterator that produces elements of the prefix sequence.
-  @frozen
   public struct Iterator: AsyncIteratorProtocol {
     @usableFromInline
     var baseIterator: Base.AsyncIterator
 
     @usableFromInline
     var remaining: Int
 
-    @inlinable
+    @usableFromInline
     init(_ baseIterator: Base.AsyncIterator, count: Int) {
       self.baseIterator = baseIterator
       self.remaining = count
diff --git a/stdlib/public/Concurrency/AsyncPrefixWhileSequence.swift b/stdlib/public/Concurrency/AsyncPrefixWhileSequence.swift
@@ -49,15 +49,14 @@ extension AsyncSequence {
 /// An asynchronous sequence, containing the initial, consecutive
 /// elements of the base sequence that satisfy a given predicate.
 @available(SwiftStdlib 5.5, *)
-@frozen
 public struct AsyncPrefixWhileSequence<Base: AsyncSequence> {
   @usableFromInline
   let base: Base
 
   @usableFromInline
   let predicate: (Base.Element) async -> Bool
 
-  @inlinable
+  @usableFromInline
   init(
     _ base: Base, 
     predicate: @escaping (Base.Element) async -> Bool
@@ -78,7 +77,6 @@ extension AsyncPrefixWhileSequence: AsyncSequence {
   public typealias AsyncIterator = Iterator
 
   /// The iterator that produces elements of the prefix-while sequence.
-  @frozen
   public struct Iterator: AsyncIteratorProtocol {
     @usableFromInline
     var predicateHasFailed = false
@@ -89,7 +87,7 @@ extension AsyncPrefixWhileSequence: AsyncSequence {
     @usableFromInline
     let predicate: (Base.Element) async -> Bool
 
-    @inlinable
+    @usableFromInline
     init(
       _ baseIterator: Base.AsyncIterator, 
       predicate: @escaping (Base.Element) async -> Bool
diff --git a/stdlib/public/Concurrency/AsyncThrowingCompactMapSequence.swift b/stdlib/public/Concurrency/AsyncThrowingCompactMapSequence.swift
@@ -68,15 +68,14 @@ extension AsyncSequence {
 /// An asynchronous sequence that maps an error-throwing closure over the base
 /// sequence’s elements, omitting results that don't return a value.
 @available(SwiftStdlib 5.5, *)
-@frozen
 public struct AsyncThrowingCompactMapSequence<Base: AsyncSequence, ElementOfResult> {
   @usableFromInline
   let base: Base
 
   @usableFromInline
   let transform: (Base.Element) async throws -> ElementOfResult?
 
-  @inlinable
+  @usableFromInline
   init(
     _ base: Base, 
     transform: @escaping (Base.Element) async throws -> ElementOfResult?
@@ -97,7 +96,6 @@ extension AsyncThrowingCompactMapSequence: AsyncSequence {
   public typealias AsyncIterator = Iterator
 
   /// The iterator that produces elements of the compact map sequence.
-  @frozen
   public struct Iterator: AsyncIteratorProtocol {
     public typealias Element = ElementOfResult
 
@@ -110,7 +108,7 @@ extension AsyncThrowingCompactMapSequence: AsyncSequence {
     @usableFromInline
     var finished = false
 
-    @inlinable
+    @usableFromInline
     init(
       _ baseIterator: Base.AsyncIterator, 
       transform: @escaping (Base.Element) async throws -> ElementOfResult?
diff --git a/stdlib/public/Concurrency/AsyncThrowingDropWhileSequence.swift b/stdlib/public/Concurrency/AsyncThrowingDropWhileSequence.swift
@@ -66,15 +66,14 @@ extension AsyncSequence {
 /// given error-throwing closure returns false, after which it passes through
 /// all remaining elements.
 @available(SwiftStdlib 5.5, *)
-@frozen
 public struct AsyncThrowingDropWhileSequence<Base: AsyncSequence> {
   @usableFromInline
   let base: Base
 
   @usableFromInline
   let predicate: (Base.Element) async throws -> Bool
 
-  @inlinable
+  @usableFromInline
   init(
     _ base: Base, 
     predicate: @escaping (Base.Element) async throws -> Bool
@@ -95,7 +94,6 @@ extension AsyncThrowingDropWhileSequence: AsyncSequence {
   public typealias AsyncIterator = Iterator
 
   /// The iterator that produces elements of the drop-while sequence.
-  @frozen
   public struct Iterator: AsyncIteratorProtocol {
     @usableFromInline
     var baseIterator: Base.AsyncIterator
@@ -109,7 +107,7 @@ extension AsyncThrowingDropWhileSequence: AsyncSequence {
     @usableFromInline
     var doneDropping = false
 
-    @inlinable
+    @usableFromInline
     init(
       _ baseIterator: Base.AsyncIterator, 
       predicate: @escaping (Base.Element) async throws -> Bool
diff --git a/stdlib/public/Concurrency/AsyncThrowingFilterSequence.swift b/stdlib/public/Concurrency/AsyncThrowingFilterSequence.swift
@@ -56,15 +56,14 @@ extension AsyncSequence {
 /// An asynchronous sequence that contains, in order, the elements of
 /// the base sequence that satisfy the given error-throwing predicate.
 @available(SwiftStdlib 5.5, *)
-@frozen
 public struct AsyncThrowingFilterSequence<Base: AsyncSequence> {
   @usableFromInline
   let base: Base
   
   @usableFromInline
   let isIncluded: (Element) async throws -> Bool
 
-  @inlinable
+  @usableFromInline
   init(
     _ base: Base, 
     isIncluded: @escaping (Base.Element) async throws -> Bool
@@ -85,7 +84,6 @@ extension AsyncThrowingFilterSequence: AsyncSequence {
   public typealias AsyncIterator = Iterator
 
   /// The iterator that produces elements of the filter sequence.
-  @frozen
   public struct Iterator: AsyncIteratorProtocol {
     @usableFromInline
     var baseIterator: Base.AsyncIterator
@@ -96,7 +94,7 @@ extension AsyncThrowingFilterSequence: AsyncSequence {
     @usableFromInline
     var finished = false
 
-    @inlinable
+    @usableFromInline
     init(
       _ baseIterator: Base.AsyncIterator,
       isIncluded: @escaping (Base.Element) async throws -> Bool
diff --git a/stdlib/public/Concurrency/AsyncThrowingFlatMapSequence.swift b/stdlib/public/Concurrency/AsyncThrowingFlatMapSequence.swift
@@ -64,7 +64,6 @@ extension AsyncSequence {
 /// An asynchronous sequence that concatenates the results of calling a given
 /// error-throwing transformation with each element of this sequence.
 @available(SwiftStdlib 5.5, *)
-@frozen
 public struct AsyncThrowingFlatMapSequence<Base: AsyncSequence, SegmentOfResult: AsyncSequence> {
   @usableFromInline
   let base: Base
@@ -93,7 +92,6 @@ extension AsyncThrowingFlatMapSequence: AsyncSequence {
   public typealias AsyncIterator = Iterator
 
   /// The iterator that produces elements of the flat map sequence.
-  @frozen
   public struct Iterator: AsyncIteratorProtocol {
     @usableFromInline
     var baseIterator: Base.AsyncIterator
diff --git a/stdlib/public/Concurrency/AsyncThrowingMapSequence.swift b/stdlib/public/Concurrency/AsyncThrowingMapSequence.swift
diff --git a/stdlib/public/Concurrency/AsyncThrowingPrefixWhileSequence.swift b/stdlib/public/Concurrency/AsyncThrowingPrefixWhileSequence.swift
diff --git a/test/api-digester/stability-concurrency-abi.test b/test/api-digester/stability-concurrency-abi.test
