wip

Author: milseman

stdlib/public/core/UTF8Span.swift

@@ -243,22 +243,34 @@ extension UTF8Span {
 
 }
 
+@available(SwiftStdlib 6.1, *)
+extension UTF8Span {
+  public static func ~=(_ lhs: StaticString, _ rhs: UTF8Span) -> Bool {
+    return lhs.withUTF8Buffer { str in
+      rhs._withUnsafeBufferPointer { span in
+        str.elementsEqual(span)
+      }
+    }
+  }
+}
+
+
 func TODO(_ message: String) -> Never {
-  fatalError("TODO: message")
+  fatalError("TODO: \(message)")
 }
 
 // TODO(toolchain): decide if we rebase on top of Guillaume's work
 @available(SwiftStdlib 6.1, *)
 extension String {
   public var utf8Span: UTF8Span {
-    TODO("Decide when to rebase on top of Guillaume's PR")
+    TODO("Decide whether to rebase on top of Span PR or wait for merge")
   }
 }
 
 @available(SwiftStdlib 6.1, *)
 extension Substring {
   public var utf8Span: UTF8Span {
-    TODO("Decide when to rebase on top of Guillaume's PR")
+    TODO("Decide whether to rebase on top of Span PR or wait for merge")
   }
 }
 

stdlib/public/core/UTF8SpanBits.swift

@@ -67,7 +67,7 @@ extension UTF8Span {
         if s.value < 0x300 {
           continue
         }
-        TODO("Adapt _StringGutsSlice._fastNFCCheck()")
+        TODO("Refactor and adapt _StringGutsSlice._fastNFCCheck()")
       }
       self._countAndFlags |= Self._nfcBit
       return true

test/stdlib/UTF8SpanIteratorTests.swift

@@ -34,15 +34,15 @@ struct ContentEquivalenceTestCase {
 
   func withUTF8Span<R>(_ f: (UTF8Span) throws -> R) rethrows -> R {
     try Array(str.utf8).withSpan { span in 
-      try f(try! UTF8Span(_validating: span))
+      try f(try! UTF8Span(validating: span))
     }
   }
 
   func testBytes() {
     let otherBytes = Array((str+"abc").utf8)
 
     withUTF8Span { utf8Span in
-      utf8Span.withUnsafeBufferPointer {
+      utf8Span._withUnsafeBufferPointer {
         expectEqualSequence(str.utf8, $0, stackTrace: loc)
       }
     }

test/stdlib/UTF8SpanQueriesComparisons.swift

@@ -17,7 +17,7 @@ extension Array where Element == UInt8 {
   }
   func withUTF8Span<R>(_ f: (UTF8Span) throws -> R) rethrows -> R {
     try self.withSpan { span in
-      try f(try! UTF8Span(_validating: span))
+      try f(try! UTF8Span(validating: span))
     }
   }
 }