Mark NFD and NFC as SPI

underscore Unicode SPI

Author: Azoy

stdlib/public/core/NFC.swift

@@ -13,13 +13,15 @@
 import SwiftShims
 
 extension Unicode {
-  internal struct _NFC<S: StringProtocol> {
+  @_spi(_Unicode)
+  public struct _NFC<S: StringProtocol> {
     let base: S
   }
 }
 
 extension Unicode._NFC {
-  internal struct Iterator {
+  @_spi(_Unicode)
+  public struct Iterator {
     var buffer = Unicode._NormDataBuffer()
 
     // This is our starter that is currently being composed with other scalars
@@ -98,7 +100,8 @@ extension Unicode._NFC.Iterator: IteratorProtocol {
     }
   }
 
-  internal mutating func next() -> Unicode.Scalar? {
+  @_spi(_Unicode)
+  public mutating func next() -> Unicode.Scalar? {
     // Empty out our buffer before attempting to compose anything with our new
     // composee.
     if let nextBuffered = buffer.next() {
@@ -211,13 +214,15 @@ extension Unicode._NFC.Iterator: IteratorProtocol {
 }
 
 extension Unicode._NFC: Sequence {
-  internal func makeIterator() -> Iterator {
+  @_spi(_Unicode)
+  public func makeIterator() -> Iterator {
     Iterator(iterator: base._nfd.makeIterator())
   }
 }
 
 extension StringProtocol {
-  internal var _nfc: Unicode._NFC<Self> {
+  @_spi(_Unicode)
+  public var _nfc: Unicode._NFC<Self> {
     Unicode._NFC(base: self)
   }
 }

stdlib/public/core/NFD.swift

@@ -11,13 +11,15 @@
 //===----------------------------------------------------------------------===//
 
 extension Unicode {
-  internal struct _NFD<S: StringProtocol> {
+  @_spi(_Unicode)
+  public struct _NFD<S: StringProtocol> {
     let base: S
   }
 }
 
 extension Unicode._NFD {
-  internal struct Iterator {
+  @_spi(_Unicode)
+  public struct Iterator {
     var buffer = Unicode._NormDataBuffer()
 
     // This index always points at the next starter of a normalization segment.
@@ -124,7 +126,8 @@ extension Unicode._NFD.Iterator: IteratorProtocol {
     }
   }
 
-  internal mutating func next() -> ScalarAndNormData? {
+  @_spi(_Unicode)
+  public mutating func next() -> ScalarAndNormData? {
     // Empty out our buffer before attempting to decompose the next
     // normalization segment.
     if let nextBuffered = buffer.next() {
@@ -166,7 +169,8 @@ extension Unicode._NFD.Iterator: IteratorProtocol {
 }
 
 extension Unicode._NFD: Sequence {
-  internal func makeIterator() -> Iterator {
+  @_spi(_Unicode)
+  public func makeIterator() -> Iterator {
     Iterator(
       index: base.unicodeScalars.startIndex,
       unicodeScalars: base.unicodeScalars
@@ -175,7 +179,8 @@ extension Unicode._NFD: Sequence {
 }
 
 extension StringProtocol {
-  internal var _nfd: Unicode._NFD<Self> {
+  @_spi(_Unicode)
+  public var _nfd: Unicode._NFD<Self> {
     Unicode._NFD(base: self)
   }
 }

stdlib/public/core/UnicodeData.swift

@@ -12,7 +12,8 @@
 
 import SwiftShims
 
-internal typealias ScalarAndNormData = (
+@_spi(_Unicode)
+public typealias ScalarAndNormData = (
   scalar: Unicode.Scalar,
   normData: Unicode._NormData
 )
@@ -45,7 +46,8 @@ extension Unicode {
   //      a scalar with a CCC value of 100, unless there are normalization
   //      boundaries between them.
   //
-  internal struct _NormData {
+  @_spi(_Unicode)
+  public struct _NormData {
     var rawValue: UInt16
 
     var ccc: UInt8 {