Expunge _preprocessingPass

Author: airspeedswift

stdlib/private/StdlibCollectionUnittest/CheckSequenceInstance.swift

@@ -87,32 +87,6 @@ public func checkSequence<
   expectGE(
     expectedCount, sequence.underestimatedCount, message(),
       stackTrace: stackTrace.pushIf(showFrame, file: file, line: line))
-
-  // Test `_copyContents(initializing:)` if we can do so without destroying the
-  // sequence.
-  _ = sequence._preprocessingPass { () -> Void in
-    var count = 0
-    for _ in sequence { count += 1 }
-    let ptr = UnsafeMutablePointer<S.Element>.allocate(capacity: count)
-    let buf = UnsafeMutableBufferPointer(start: ptr, count: count)
-    var (remainders,writtenUpTo) = sequence._copyContents(initializing: buf)
-    expectTrue(remainders.next() == nil,
-      "_copyContents returned unwritten elements")
-    expectTrue(writtenUpTo == buf.endIndex,
-      "_copyContents failed to use entire buffer")
-    expectEqualSequence(expected, buf, message(),
-      stackTrace: stackTrace.pushIf(showFrame, file: file, line: line), sameValue: sameValue)
-    ptr.deinitialize(count: count)
-    ptr.deallocate()
-  }
-
-  // Test `_copyToContiguousArray()` if we can do so
-  // without destroying the sequence.
-  _ = sequence._preprocessingPass { () -> Void in
-    let copy = sequence._copyToContiguousArray()
-    expectEqualSequence(expected, copy, message(),
-      stackTrace: stackTrace.pushIf(showFrame, file: file, line: line), sameValue: sameValue)
-  }
 }
 
 public func checkSequence<
@@ -206,32 +180,6 @@ public func checkSequence<
   expectGE(
     expectedCount, sequence.underestimatedCount, message(),
     stackTrace: stackTrace.pushIf(showFrame, file: file, line: line))
-
-  // Test `_copyContents(initializing:)` if we can do so without destroying the
-  // sequence.
-  _ = sequence._preprocessingPass { () -> Void in
-    var count = 0
-    for _ in sequence { count += 1 }
-    let ptr = UnsafeMutablePointer<S.Element>.allocate(capacity: count)
-    let buf = UnsafeMutableBufferPointer(start: ptr, count: count)
-    var (remainders,writtenUpTo) = sequence._copyContents(initializing: buf)
-    expectTrue(remainders.next() == nil,
-      "_copyContents returned unwritten elements")
-    expectTrue(writtenUpTo == buf.endIndex,
-      "_copyContents failed to use entire buffer")
-    expectEqualSequence(expected, buf, message(),
-    stackTrace: stackTrace.pushIf(showFrame, file: file, line: line), sameValue: sameValue)
-    ptr.deinitialize(count: count)
-    ptr.deallocate()
-  }
-
-  // Test `_copyToContiguousArray()` if we can do so
-  // without destroying the sequence.
-  _ = sequence._preprocessingPass { () -> Void in
-    let copy = sequence._copyToContiguousArray()
-    expectEqualSequence(expected, copy, message(),
-    stackTrace: stackTrace.pushIf(showFrame, file: file, line: line), sameValue: sameValue)
-  }
 }
 
 public func checkSequence<

stdlib/private/StdlibCollectionUnittest/CheckSequenceType.swift

@@ -1978,52 +1978,6 @@ self.test("\(testNamePrefix).first(where:)/semantics") {
   }
 }
 
-//===----------------------------------------------------------------------===//
-// _preprocessingPass()
-//===----------------------------------------------------------------------===//
-
-self.test("\(testNamePrefix)._preprocessingPass/semantics") {
-  for test in forEachTests {
-    let s = makeWrappedSequence(test.sequence.map(OpaqueValue.init))
-    var wasInvoked = false
-    let result = s._preprocessingPass {
-      () -> OpaqueValue<Int> in
-      wasInvoked = true
-
-      expectEqualSequence(
-        test.sequence,
-        s.map { extractValue($0).value })
-
-      return OpaqueValue(42)
-    }
-    if wasInvoked {
-      expectEqual(42, result?.value)
-    } else {
-      expectNil(result)
-    }
-  }
-
-  for test in forEachTests {
-    let s = makeWrappedSequence(test.sequence.map(OpaqueValue.init))
-    var wasInvoked = false
-    var caughtError: Error?
-    var result: OpaqueValue<Int>?
-    do {
-      result = try s._preprocessingPass {
-        () -> OpaqueValue<Int> in
-        wasInvoked = true
-        throw TestError.error2
-      }
-    } catch {
-      caughtError = error
-    }
-    expectNil(result)
-    if wasInvoked {
-      expectEqual(TestError.error2, caughtError as? TestError)
-    }
-  }
-}
-
 //===----------------------------------------------------------------------===//
   } // addSequenceTests
 }

stdlib/private/StdlibCollectionUnittest/LoggingWrappers.swift

@@ -84,7 +84,6 @@ public class SequenceLog {
   public static var prefixMaxLength = TypeIndexed(0)
   public static var suffixMaxLength = TypeIndexed(0)
   public static var _customContainsEquatableElement = TypeIndexed(0)
-  public static var _preprocessingPass = TypeIndexed(0)
   public static var _copyToContiguousArray = TypeIndexed(0)
   public static var _copyContents = TypeIndexed(0)  
   // Collection
@@ -217,16 +216,6 @@ extension LoggingSequence: Sequence {
     return base._customContainsEquatableElement(element)
   }
 
-  /// If `self` is multi-pass (i.e., a `Collection`), invoke
-  /// `preprocess` on `self` and return its result.  Otherwise, return
-  /// `nil`.
-  public func _preprocessingPass<R>(
-    _ preprocess: () throws -> R
-  ) rethrows -> R? {
-    SequenceLog._preprocessingPass[selfType] += 1
-    return try base._preprocessingPass(preprocess)
-  }
-
   /// Create a native array buffer containing the elements of `self`,
   /// in the same order.
   public func _copyToContiguousArray() -> ContiguousArray<Element> {

stdlib/public/core/Collection.swift

@@ -1668,13 +1668,3 @@ extension Collection where SubSequence == Self {
     self = self[index(startIndex, offsetBy: k)..<endIndex]
   }
 }
-
-extension Collection {
-  @inlinable
-  @inline(__always)
-  public func _preprocessingPass<R>(
-    _ preprocess: () throws -> R
-  ) rethrows -> R? {
-    return try preprocess()
-  }
-}

stdlib/public/core/ExistentialCollection.swift.gyb

@@ -220,13 +220,6 @@ internal class _AnyRandomAccessCollectionBox<Element>
     _abstract()
   }
 
-  @inlinable
-  internal func __preprocessingPass<R>(
-    _ preprocess: () throws -> R
-  ) rethrows -> R? {
-    _abstract()
-  }
-
   @inlinable
   internal func __copyToContiguousArray() -> ContiguousArray<Element> {
     _abstract()
@@ -471,12 +464,6 @@ internal final class _${Kind}Box<S : ${Kind}> : _Any${Kind}Box<S.Element>
     return _base._customContainsEquatableElement(element)
   }
   @inlinable
-  internal override func __preprocessingPass<R>(
-    _ preprocess: () throws -> R
-  ) rethrows -> R? {
-    return try _base._preprocessingPass(preprocess)
-  }
-  @inlinable
   internal override func __copyToContiguousArray() -> ContiguousArray<Element> {
     return _base._copyToContiguousArray()
   }
@@ -830,13 +817,6 @@ extension Any${Kind} {
     return _box.__customContainsEquatableElement(element)
   }
 
-  @inlinable
-  public func _preprocessingPass<R>(
-    _ preprocess: () throws -> R
-  ) rethrows -> R? {
-    return try _box.__preprocessingPass(preprocess)
-  }
-
   @inlinable
   public __consuming func _copyToContiguousArray() -> ContiguousArray<Element> {
     return self._box.__copyToContiguousArray()

stdlib/public/core/Join.swift

@@ -133,20 +133,7 @@ extension JoinedSequence: Sequence {
   @inlinable // lazy-performance
   public __consuming func _copyToContiguousArray() -> ContiguousArray<Element> {
     var result = ContiguousArray<Element>()
-    let separatorSize: Int = numericCast(_separator.count)
-
-    let reservation = _base._preprocessingPass {
-      () -> Int in
-      var r = 0
-      for chunk in _base {
-        r += separatorSize + chunk.underestimatedCount
-      }
-      return r - separatorSize
-    }
-
-    if let n = reservation {
-      result.reserveCapacity(numericCast(n))
-    }
+    let separatorSize = _separator.count
 
     if separatorSize == 0 {
       for x in _base {

stdlib/public/core/Sequence.swift

@@ -353,12 +353,6 @@ public protocol Sequence {
     _ element: Element
   ) -> Bool?
 
-  /// If `self` is multi-pass (i.e., a `Collection`), invoke `preprocess` and
-  /// return its result.  Otherwise, return `nil`.
-  func _preprocessingPass<R>(
-    _ preprocess: () throws -> R
-  ) rethrows -> R?
-
   /// Create a native array buffer containing the elements of `self`,
   /// in the same order.
   __consuming func _copyToContiguousArray() -> ContiguousArray<Element>
@@ -665,14 +659,6 @@ extension Sequence {
     return 0
   }
 
-  @inlinable
-  @inline(__always)
-  public func _preprocessingPass<R>(
-    _ preprocess: () throws -> R
-  ) rethrows -> R? {
-    return nil
-  }
-
   @inlinable
   @inline(__always)
   public func _customContainsEquatableElement(

stdlib/public/core/Stride.swift

@@ -289,13 +289,6 @@ extension StrideTo: Sequence {
     return count
   }
 
-  @inlinable
-  public func _preprocessingPass<R>(
-    _ preprocess: () throws -> R
-  ) rethrows -> R? {
-    return try preprocess()
-  }
-
   @inlinable
   public func _customContainsEquatableElement(
     _ element: Element
@@ -504,13 +497,6 @@ extension StrideThrough: Sequence {
     return count
   }
 
-  @inlinable
-  public func _preprocessingPass<R>(
-    _ preprocess: () throws -> R
-  ) rethrows -> R? {
-    return try preprocess()
-  }
-
   @inlinable
   public func _customContainsEquatableElement(
     _ element: Element

test/api-digester/Outputs/stability-stdlib-abi.swift.expected

@@ -259,3 +259,24 @@ Var Dictionary.keys has declared type change from LazyMapCollection<Dictionary<
 Var Dictionary.values has declared type change from LazyMapCollection<Dictionary<τ_0_0, τ_0_1>, τ_0_1> to LazyMapSequence<Dictionary<τ_0_0, τ_0_1>, τ_0_1>
 Var LazySequence._base has removed its setter
 Var _DropWhileSequence._iterator has declared type change from τ_0_0 to τ_0_0.Iterator
+Func Collection._preprocessingPass(_:) has been removed
+Func StrideThrough._preprocessingPass(_:) has been removed
+Func StrideTo._preprocessingPass(_:) has been removed
+Func AnyBidirectionalCollection._preprocessingPass(_:) has been removed
+Func AnyCollection._preprocessingPass(_:) has been removed
+Func AnyRandomAccessCollection._preprocessingPass(_:) has been removed
+Func AnySequence._preprocessingPass(_:) has been removed
+Func Sequence._preprocessingPass(_:) has been removed
+Func _AnySequenceBox.__copyContents(initializing:) in a non-resilient type changes position from 7 to 6
+Func _AnySequenceBox.__copyToContiguousArray() in a non-resilient type changes position from 6 to 5
+Func _AnySequenceBox.__preprocessingPass(_:) has been removed
+Func _AnySequenceBox._drop(while:) in a non-resilient type changes position from 8 to 7
+Func _AnySequenceBox._dropFirst(_:) in a non-resilient type changes position from 9 to 8
+Func _AnySequenceBox._dropLast(_:) in a non-resilient type changes position from 10 to 9
+Func _AnySequenceBox._prefix(_:) in a non-resilient type changes position from 11 to 10
+Func _AnySequenceBox._prefix(while:) in a non-resilient type changes position from 12 to 11
+Func _AnySequenceBox._suffix(_:) in a non-resilient type changes position from 13 to 12
+Func _BidirectionalCollectionBox.__preprocessingPass(_:) has been removed
+Func _CollectionBox.__preprocessingPass(_:) has been removed
+Func _RandomAccessCollectionBox.__preprocessingPass(_:) has been removed
+Func _SequenceBox.__preprocessingPass(_:) has been removed

validation-test/stdlib/ExistentialCollection.swift.gyb

@@ -155,10 +155,6 @@ tests.test("${TestedType}: dispatch to wrapped, SequenceLog") {
     _ = s._customContainsEquatableElement(OpaqueValue(42))
   }
 
-  Log._preprocessingPass.expectIncrement(Base.self) {
-    _ = s._preprocessingPass {}
-  }
-
   Log._copyToContiguousArray.expectIncrement(Base.self) {
     _ = s._copyToContiguousArray()
   }