[stdlib] move span properties of array types

…to a more logical spot in each of their files

Author: glessard

stdlib/public/core/Array.swift

@@ -1428,25 +1428,6 @@ extension Array: RangeReplaceableCollection {
     }
   }
 
-  @available(SwiftStdlib 6.2, *)
-  public var span: Span<Element> {
-    @lifetime(borrow self)
-    @_alwaysEmitIntoClient
-    borrowing get {
-#if _runtime(_ObjC)
-      if _slowPath(!_buffer._isNative) {
-        let buffer = _buffer.getOrAllocateAssociatedObjectBuffer()
-        let (pointer, count) = unsafe (buffer.firstElementAddress, buffer.count)
-        let span = unsafe Span(_unsafeStart: pointer, count: count)
-        return unsafe _overrideLifetime(span, borrowing: self)
-      }
-#endif
-      let (pointer, count) = unsafe (_buffer.firstElementAddress, _buffer.count)
-      let span = unsafe Span(_unsafeStart: pointer, count: count)
-      return unsafe _overrideLifetime(span, borrowing: self)
-    }
-  }
-
   @inlinable
   public __consuming func _copyToContiguousArray() -> ContiguousArray<Element> {
     if let n = _buffer.requestNativeBuffer() {
@@ -1630,6 +1611,27 @@ extension Array {
     return try unsafe _buffer.withUnsafeBufferPointer(body)
   }
 
+  @available(SwiftStdlib 6.2, *)
+  public var span: Span<Element> {
+    @lifetime(borrow self)
+    @_alwaysEmitIntoClient
+    borrowing get {
+#if _runtime(_ObjC)
+      if _slowPath(!_buffer._isNative) {
+        let buffer = _buffer.getOrAllocateAssociatedObjectBuffer()
+        let pointer = unsafe buffer.firstElementAddress
+        let count = buffer.immutableCount
+        let span = unsafe Span(_unsafeStart: pointer, count: count)
+        return unsafe _overrideLifetime(span, borrowing: self)
+      }
+#endif
+      let pointer = unsafe _buffer.firstElementAddress
+      let count = _buffer.immutableCount
+      let span = unsafe Span(_unsafeStart: pointer, count: count)
+      return unsafe _overrideLifetime(span, borrowing: self)
+    }
+  }
+
   // Superseded by the typed-throws version of this function, but retained
   // for ABI reasons.
   @_semantics("array.withUnsafeMutableBufferPointer")

stdlib/public/core/ArraySlice.swift

@@ -1116,17 +1116,6 @@ extension ArraySlice: RangeReplaceableCollection {
     }
   }
 
-  @available(SwiftStdlib 6.2, *)
-  public var span: Span<Element> {
-    @lifetime(borrow self)
-    @_alwaysEmitIntoClient
-    borrowing get {
-      let (pointer, count) = (_buffer.firstElementAddress, _buffer.count)
-      let span = unsafe Span(_unsafeStart: pointer, count: count)
-      return unsafe _overrideLifetime(span, borrowing: self)
-    }
-  }
-
   @inlinable
   public __consuming func _copyToContiguousArray() -> ContiguousArray<Element> {
     if let n = _buffer.requestNativeBuffer() {
@@ -1221,6 +1210,17 @@ extension ArraySlice {
     return try _buffer.withUnsafeBufferPointer(body)
   }
 
+  @available(SwiftStdlib 6.2, *)
+  public var span: Span<Element> {
+    @lifetime(borrow self)
+    @_alwaysEmitIntoClient
+    borrowing get {
+      let (pointer, count) = unsafe (_buffer.firstElementAddress, _buffer.count)
+      let span = unsafe Span(_unsafeStart: pointer, count: count)
+      return unsafe _overrideLifetime(span, borrowing: self)
+    }
+  }
+
   // Superseded by the typed-throws version of this function, but retained
   // for ABI reasons.
   @_semantics("array.withUnsafeMutableBufferPointer")

stdlib/public/core/ContiguousArray.swift

@@ -1021,17 +1021,6 @@ extension ContiguousArray: RangeReplaceableCollection {
     }
   }
 
-  @available(SwiftStdlib 6.2, *)
-  public var span: Span<Element> {
-    @lifetime(borrow self)
-    @_alwaysEmitIntoClient
-    borrowing get {
-      let (pointer, count) = unsafe (_buffer.firstElementAddress, _buffer.count)
-      let span = unsafe Span(_unsafeStart: pointer, count: count)
-      return unsafe _overrideLifetime(span, borrowing: self)
-    }
-  }
-
   @inlinable
   public __consuming func _copyToContiguousArray() -> ContiguousArray<Element> {
     if let n = _buffer.requestNativeBuffer() {
@@ -1163,6 +1152,18 @@ extension ContiguousArray {
     return try unsafe _buffer.withUnsafeBufferPointer(body)
   }
 
+  @available(SwiftStdlib 6.2, *)
+  public var span: Span<Element> {
+    @lifetime(borrow self)
+    @_alwaysEmitIntoClient
+    borrowing get {
+      let pointer = unsafe _buffer.firstElementAddress
+      let count = _buffer.immutableCount
+      let span = unsafe Span(_unsafeStart: pointer, count: count)
+      return unsafe _overrideLifetime(span, borrowing: self)
+    }
+  }
+
   // Superseded by the typed-throws version of this function, but retained
   // for ABI reasons.
   @_semantics("array.withUnsafeMutableBufferPointer")