Borrow -> Borrowing

Author: natecook1000

…public/core/BorrowIteratorProtocol.swift …lic/core/BorrowingIteratorProtocol.swiftstdlib/public/core/BorrowIteratorProtocol.swift renamed to stdlib/public/core/BorrowingIteratorProtocol.swift stdlib/public/core/BorrowIteratorProtocol.swift renamed to stdlib/public/core/BorrowingIteratorProtocol.swift

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 @available(SwiftStdlib 6.3, *)
-public protocol BorrowIteratorProtocol<Element>: ~Copyable, ~Escapable {
+public protocol BorrowingIteratorProtocol<Element>: ~Copyable, ~Escapable {
   associatedtype Element: ~Copyable
 
   // FIXME: This ought to be a core requirement, but `Ref` is not a thing yet.
@@ -90,7 +90,7 @@ public protocol BorrowIteratorProtocol<Element>: ~Copyable, ~Escapable {
 }
 
 @available(SwiftStdlib 6.3, *)
-extension BorrowIteratorProtocol where Self: ~Copyable & ~Escapable {
+extension BorrowingIteratorProtocol where Self: ~Copyable & ~Escapable {
   @_alwaysEmitIntoClient
   @_lifetime(&self)
   @_lifetime(self: copy self)
@@ -101,7 +101,7 @@ extension BorrowIteratorProtocol where Self: ~Copyable & ~Escapable {
 }
 
 @available(SwiftStdlib 6.3, *)
-extension BorrowIteratorProtocol where Self: ~Copyable & ~Escapable {
+extension BorrowingIteratorProtocol where Self: ~Copyable & ~Escapable {
   @_alwaysEmitIntoClient
   @_lifetime(self: copy self)
   public mutating func skip(by offset: Int) -> Int {
@@ -115,29 +115,29 @@ extension BorrowIteratorProtocol where Self: ~Copyable & ~Escapable {
   }
 }
 
-@available(SwiftStdlib 6.3, *)
-extension Span: Iterable where Element: ~Copyable {
-  // FIXME: This simple definition cannot also be a backward (or bidirectional)
-  // iterator, nor a random-access iterator. If we want to go in that direction,
-  // we'll need to rather introduce a type more like `RigidArray.BorrowIterator`.
-  public typealias BorrowIterator = Self
-
-  @_alwaysEmitIntoClient
-  @_transparent
-  public var estimatedCount: EstimatedCount {
-    .exactly(count)
-  }
-
-  @_alwaysEmitIntoClient
-  @_lifetime(copy self)
-  @_transparent
-  public func startBorrowIteration() -> Span<Element> {
-    self
-  }
-}
+//@available(SwiftStdlib 6.3, *)
+//extension Span: Iterable where Element: ~Copyable {
+//  // FIXME: This simple definition cannot also be a backward (or bidirectional)
+//  // iterator, nor a random-access iterator. If we want to go in that direction,
+//  // we'll need to rather introduce a type more like `RigidArray.BorrowIterator`.
+//  public typealias BorrowIterator = Self
+//
+//  @_alwaysEmitIntoClient
+//  @_transparent
+//  public var estimatedCount: EstimatedCount {
+//    .exactly(count)
+//  }
+//
+//  @_alwaysEmitIntoClient
+//  @_lifetime(copy self)
+//  @_transparent
+//  public func startBorrowIteration() -> Span<Element> {
+//    self
+//  }
+//}
 
 @available(SwiftStdlib 6.3, *)
-extension Span: BorrowIteratorProtocol where Element: ~Copyable {
+extension Span: BorrowingIteratorProtocol where Element: ~Copyable {
   @_alwaysEmitIntoClient
   @_lifetime(&self)
   @_lifetime(self: copy self)
@@ -148,38 +148,38 @@ extension Span: BorrowIteratorProtocol where Element: ~Copyable {
   }
 }
 
-@available(SwiftStdlib 6.3, *)
-extension MutableSpan: Iterable where Element: ~Copyable {
-  public typealias BorrowIterator = Span<Element>.BorrowIterator
-
-  @_alwaysEmitIntoClient
-  @_transparent
-  public var estimatedCount: EstimatedCount {
-    .exactly(count)
-  }
-
-  @_alwaysEmitIntoClient
-  @_lifetime(borrow self)
-  @_transparent
-  public func startBorrowIteration() -> Span<Element> {
-    span
-  }
-}
-
-@available(SwiftStdlib 6.3, *)
-extension OutputSpan: Iterable where Element: ~Copyable {
-  public typealias BorrowIterator = Span<Element>.BorrowIterator
-
-  @_alwaysEmitIntoClient
-  @_transparent
-  public var estimatedCount: EstimatedCount {
-    .exactly(count)
-  }
-
-  @_alwaysEmitIntoClient
-  @_lifetime(borrow self)
-  @_transparent
-  public func startBorrowIteration() -> Span<Element> {
-    self.span
-  }
-}
+//@available(SwiftStdlib 6.3, *)
+//extension MutableSpan: Iterable where Element: ~Copyable {
+//  public typealias BorrowIterator = Span<Element>.BorrowIterator
+//
+//  @_alwaysEmitIntoClient
+//  @_transparent
+//  public var estimatedCount: EstimatedCount {
+//    .exactly(count)
+//  }
+//
+//  @_alwaysEmitIntoClient
+//  @_lifetime(borrow self)
+//  @_transparent
+//  public func startBorrowIteration() -> Span<Element> {
+//    span
+//  }
+//}
+//
+//@available(SwiftStdlib 6.3, *)
+//extension OutputSpan: Iterable where Element: ~Copyable {
+//  public typealias BorrowIterator = Span<Element>.BorrowIterator
+//
+//  @_alwaysEmitIntoClient
+//  @_transparent
+//  public var estimatedCount: EstimatedCount {
+//    .exactly(count)
+//  }
+//
+//  @_alwaysEmitIntoClient
+//  @_lifetime(borrow self)
+//  @_transparent
+//  public func startBorrowIteration() -> Span<Element> {
+//    self.span
+//  }
+//}

stdlib/public/core/CMakeLists.txt

@@ -45,7 +45,7 @@ split_embedded_sources(
   EMBEDDED BidirectionalCollection.swift
   EMBEDDED Bitset.swift
   EMBEDDED Bool.swift
-  EMBEDDED BorrowIteratorProtocol.swift
+  EMBEDDED BorrowingIteratorProtocol.swift
     NORMAL BridgeObjectiveC.swift
   EMBEDDED BridgeStorage.swift
     NORMAL BridgingBuffer.swift

stdlib/public/core/GroupInfo.json

@@ -278,7 +278,7 @@
     "InlineArray.swift",
     "_InlineArray.swift",
     "Iterable.swift",
-    "BorrowIteratorProtocol.swift"
+    "BorrowingIteratorProtocol.swift"
   ],
   "Result": [
     "Result.swift"

stdlib/public/core/Iterable.swift

@@ -21,7 +21,7 @@ public enum EstimatedCount {
 @available(SwiftStdlib 6.3, *)
 public protocol Iterable<Element>: ~Copyable, ~Escapable {
   associatedtype Element: ~Copyable
-  associatedtype BorrowIterator: BorrowIteratorProtocol<Element> & ~Copyable & ~Escapable
+  associatedtype BorrowIterator: BorrowingIteratorProtocol<Element> & ~Copyable & ~Escapable
 
   var isEmpty: Bool { get }