wip: re-arrange availability

Author: milseman

stdlib/public/core/UTF8EncodingError.swift

@@ -211,51 +211,51 @@ extension UTF8.ValidationError: CustomStringConvertible {
   }
 }
 
-@available(SwiftStdlib 6.2, *)
- extension UTF8 {
-    @usableFromInline // for testing purposes
-    internal static func _checkAllErrors(
-      _ s: some Sequence<UInt8>
-    ) -> Array<UTF8.ValidationError> {
-      // TODO: Span fast path
-      // TODO: Fixed size buffer for non-contig inputs
-      // TODO: Lifetime-dependent result variant
-      let cus = Array(s)
-      return unsafe cus.withUnsafeBytes {
-        var bufPtr = unsafe $0
-        var start = 0
-        var errors: Array<UTF8.ValidationError> = []
-
-        // Remember the previous error, so that we can
-        // apply it to subsequent bytes instead of reporting
-        // just `.unexpectedContinuation`.
-        var priorError: UTF8.ValidationError? = nil
-        while true {
-          do throws(UTF8.ValidationError) {
-            _ = unsafe try bufPtr.baseAddress!._validateUTF8(limitedBy: bufPtr.count)
-            return errors
-          } catch {
-            let adjustedRange =
-              error.byteOffsets.lowerBound + start ..< error.byteOffsets.upperBound + start
-
-            let kind: UTF8.ValidationError.Kind
-            if let prior = priorError,
-               prior.byteOffsets.upperBound == adjustedRange.lowerBound,
-               error.kind == .unexpectedContinuationByte
-            {
-              kind = prior.kind
-            } else {
-              kind = error.kind
-            }
-            let adjustedErr = UTF8.ValidationError(kind, adjustedRange)
-            priorError = adjustedErr
-
-            let errEnd = error.byteOffsets.upperBound
-            start += errEnd
-            unsafe bufPtr = .init(rebasing: bufPtr[errEnd...])
-            errors.append(adjustedErr)
+extension UTF8 {
+  @available(SwiftStdlib 6.2, *)
+  @usableFromInline // for testing purposes
+  internal static func _checkAllErrors(
+    _ s: some Sequence<UInt8>
+  ) -> Array<UTF8.ValidationError> {
+    // TODO: Span fast path
+    // TODO: Fixed size buffer for non-contig inputs
+    // TODO: Lifetime-dependent result variant
+    let cus = Array(s)
+    return unsafe cus.withUnsafeBytes {
+      var bufPtr = unsafe $0
+      var start = 0
+      var errors: Array<UTF8.ValidationError> = []
+
+      // Remember the previous error, so that we can
+      // apply it to subsequent bytes instead of reporting
+      // just `.unexpectedContinuation`.
+      var priorError: UTF8.ValidationError? = nil
+      while true {
+        do throws(UTF8.ValidationError) {
+          _ = unsafe try bufPtr.baseAddress!._validateUTF8(limitedBy: bufPtr.count)
+          return errors
+        } catch {
+          let adjustedRange =
+            error.byteOffsets.lowerBound + start ..< error.byteOffsets.upperBound + start
+
+          let kind: UTF8.ValidationError.Kind
+          if let prior = priorError,
+             prior.byteOffsets.upperBound == adjustedRange.lowerBound,
+             error.kind == .unexpectedContinuationByte
+          {
+            kind = prior.kind
+          } else {
+            kind = error.kind
           }
+          let adjustedErr = UTF8.ValidationError(kind, adjustedRange)
+          priorError = adjustedErr
+
+          let errEnd = error.byteOffsets.upperBound
+          start += errEnd
+          unsafe bufPtr = .init(rebasing: bufPtr[errEnd...])
+          errors.append(adjustedErr)
         }
       }
     }
- }
+  }
+}

stdlib/public/core/UTF8Span.swift

@@ -184,8 +184,8 @@ extension UTF8Span {
 }
 
 // TODO(toolchain): decide if we rebase on top of Guillaume's work
-@available(SwiftStdlib 6.2, *)
 extension String {
+  @available(SwiftStdlib 6.2, *)
   public var utf8Span: UTF8Span {
     @lifetime(borrow self)
     borrowing get {
@@ -200,8 +200,8 @@ extension String {
   }
 }
 
-@available(SwiftStdlib 6.2, *)
 extension Substring {
+  @available(SwiftStdlib 6.2, *)
   public var utf8Span: UTF8Span {
     @lifetime(borrow self)
     borrowing get {