[ABI] Remove _HasContiguousBytes

Author: karwa

stdlib/public/core/ContiguouslyStored.swift

@@ -10,69 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-@usableFromInline
-internal protocol _HasContiguousBytes {
-  func withUnsafeBytes<R>(
-    _ body: (UnsafeRawBufferPointer) throws -> R
-  ) rethrows -> R
-
-  var _providesContiguousBytesNoCopy: Bool { get }
-}
-extension _HasContiguousBytes {
-  @inlinable
-  var _providesContiguousBytesNoCopy: Bool {
-    @inline(__always) get { return true }
-  }
-}
-extension Array: _HasContiguousBytes {
-  @inlinable
-  var _providesContiguousBytesNoCopy: Bool {
-    @inline(__always) get {
-#if _runtime(_ObjC)
-      return _buffer._isNative
-#else
-      return true
-#endif
-    }
-  }
-}
-extension ContiguousArray: _HasContiguousBytes {}
-extension UnsafeBufferPointer: _HasContiguousBytes {
-  @inlinable @inline(__always)
-  func withUnsafeBytes<R>(
-    _ body: (UnsafeRawBufferPointer) throws -> R
-  ) rethrows -> R {
-    let ptr = UnsafeRawPointer(self.baseAddress._unsafelyUnwrappedUnchecked)
-    let len = self.count &* MemoryLayout<Element>.stride
-    return try body(UnsafeRawBufferPointer(start: ptr, count: len))
-  }
-}
-extension UnsafeMutableBufferPointer: _HasContiguousBytes {
-  @inlinable @inline(__always)
-  func withUnsafeBytes<R>(
-    _ body: (UnsafeRawBufferPointer) throws -> R
-  ) rethrows -> R {
-    let ptr = UnsafeRawPointer(self.baseAddress._unsafelyUnwrappedUnchecked)
-    let len = self.count &* MemoryLayout<Element>.stride
-    return try body(UnsafeRawBufferPointer(start: ptr, count: len))
-  }
-}
-extension UnsafeRawBufferPointer: _HasContiguousBytes {
-  @inlinable @inline(__always)
-  func withUnsafeBytes<R>(
-    _ body: (UnsafeRawBufferPointer) throws -> R
-  ) rethrows -> R {
-    return try body(self)
-  }
-}
-extension UnsafeMutableRawBufferPointer: _HasContiguousBytes {
-  @inlinable @inline(__always)
-  func withUnsafeBytes<R>(
-    _ body: (UnsafeRawBufferPointer) throws -> R
-  ) rethrows -> R {
-    return try body(UnsafeRawBufferPointer(self))
-  }
-}
 extension String {
 
   @inlinable @inline(__always)

stdlib/public/core/String.swift

@@ -401,13 +401,11 @@ extension String {
   public init<C: Collection, Encoding: Unicode.Encoding>(
     decoding codeUnits: C, as sourceEncoding: Encoding.Type
   ) where C.Iterator.Element == Encoding.CodeUnit {
-    if let contigBytes = codeUnits as? _HasContiguousBytes,
-       sourceEncoding == UTF8.self,
-       contigBytes._providesContiguousBytesNoCopy
-    {
-      self = contigBytes.withUnsafeBytes { rawBufPtr -> String in
-        return String._fromUTF8Repairing(rawBufPtr).0
-      }
+    if sourceEncoding == UTF8.self,
+      let str = codeUnits._withRawContiguousStorageIfAvailable({
+        buf -> String in String._fromUTF8Repairing(buf).0
+      }) {
+      self = str
       return
     }
 

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

@@ -96,3 +96,11 @@ Struct Substring has removed conformance to _HasContiguousBytes
 Var String._providesContiguousBytesNoCopy has been removed
 Var Substring._providesContiguousBytesNoCopy has been removed
 Func Sequence._withRawContiguousStorageIfAvailable(_:) has been added as a protocol requirement
+Func UnsafeBufferPointer.withUnsafeBytes(_:) has been removed
+Func UnsafeMutableBufferPointer.withUnsafeBytes(_:) has been removed
+Protocol _HasContiguousBytes has been removed
+Struct Array has removed conformance to _HasContiguousBytes
+Struct ContiguousArray has removed conformance to _HasContiguousBytes
+Struct UnsafeBufferPointer has removed conformance to _HasContiguousBytes
+Struct UnsafeMutableBufferPointer has removed conformance to _HasContiguousBytes
+Var Array._providesContiguousBytesNoCopy has been removed