Rebase after type rename

Author: grynspan

Sources/Overlays/_Testing_Foundation/Attachments/Test.Attachable+Encodable&NSSecureCoding.swift renamed to Sources/Overlays/_Testing_Foundation/Attachments/Attachable+Encodable&NSSecureCoding.swift

@@ -13,9 +13,9 @@
 public import Foundation
 
 @_spi(Experimental)
-extension Test.Attachable where Self: Encodable & NSSecureCoding {
+extension Attachable where Self: Encodable & NSSecureCoding {
   @_documentation(visibility: private)
-  public func withUnsafeBufferPointer<R>(for attachment: borrowing Test.Attachment<Self>, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R {
+  public func withUnsafeBufferPointer<R>(for attachment: borrowing Attachment<Self>, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R {
     try _Testing_Foundation.withUnsafeBufferPointer(encoding: self, for: attachment, body)
   }
 }

Sources/Overlays/_Testing_Foundation/Attachments/Test.Attachable+Encodable.swift renamed to Sources/Overlays/_Testing_Foundation/Attachments/Attachable+Encodable.swift

@@ -26,7 +26,7 @@ private import Foundation
 ///
 /// - Throws: Whatever is thrown by `body`, or any error that prevented the
 ///   creation of the buffer.
-func withUnsafeBufferPointer<E, R>(encoding attachableValue: borrowing E, for attachment: borrowing Test.Attachment<E>, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R where E: Test.Attachable & Encodable {
+func withUnsafeBufferPointer<E, R>(encoding attachableValue: borrowing E, for attachment: borrowing Attachment<E>, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R where E: Attachable & Encodable {
   let format = try EncodingFormat(for: attachment)
 
   let data: Data
@@ -53,7 +53,7 @@ func withUnsafeBufferPointer<E, R>(encoding attachableValue: borrowing E, for at
 // encoding to JSON. This lets developers provide trivial conformance to the
 // protocol for types that already support Codable.
 @_spi(Experimental)
-extension Test.Attachable where Self: Encodable {
+extension Attachable where Self: Encodable {
   /// Encode this value into a buffer using either [`PropertyListEncoder`](https://developer.apple.com/documentation/foundation/propertylistencoder)
   /// or [`JSONEncoder`](https://developer.apple.com/documentation/foundation/jsonencoder),
   /// then call a function and pass that buffer to it.
@@ -90,7 +90,7 @@ extension Test.Attachable where Self: Encodable {
   ///   some other path extension, that path extension must represent a type
   ///   that conforms to [`UTType.propertyList`](https://developer.apple.com/documentation/uniformtypeidentifiers/uttype-swift.struct/propertylist)
   ///   or to [`UTType.json`](https://developer.apple.com/documentation/uniformtypeidentifiers/uttype-swift.struct/json).
-  public func withUnsafeBufferPointer<R>(for attachment: borrowing Test.Attachment<Self>, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R {
+  public func withUnsafeBufferPointer<R>(for attachment: borrowing Attachment<Self>, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R {
     try _Testing_Foundation.withUnsafeBufferPointer(encoding: self, for: attachment, body)
   }
 }

Sources/Overlays/_Testing_Foundation/Attachments/Test.Attachable+NSSecureCoding.swift renamed to Sources/Overlays/_Testing_Foundation/Attachments/Attachable+NSSecureCoding.swift

@@ -16,7 +16,7 @@ public import Foundation
 // NSSecureCoding-conformant classes by default. The implementation uses
 // NSKeyedArchiver for encoding.
 @_spi(Experimental)
-extension Test.Attachable where Self: NSSecureCoding {
+extension Attachable where Self: NSSecureCoding {
   /// Encode this object using [`NSKeyedArchiver`](https://developer.apple.com/documentation/foundation/nskeyedarchiver)
   /// into a buffer, then call a function and pass that buffer to it.
   ///
@@ -50,7 +50,7 @@ extension Test.Attachable where Self: NSSecureCoding {
   /// - Note: On Apple platforms, if the attachment's preferred name includes
   ///   some other path extension, that path extension must represent a type
   ///   that conforms to [`UTType.propertyList`](https://developer.apple.com/documentation/uniformtypeidentifiers/uttype-swift.struct/propertylist).
-  public func withUnsafeBufferPointer<R>(for attachment: borrowing Test.Attachment<Self>, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R {
+  public func withUnsafeBufferPointer<R>(for attachment: borrowing Attachment<Self>, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R {
     let format = try EncodingFormat(for: attachment)
 
     var data = try NSKeyedArchiver.archivedData(withRootObject: self, requiringSecureCoding: true)

Sources/Overlays/_Testing_Foundation/Attachments/Test.Attachment+URL.swift renamed to Sources/Overlays/_Testing_Foundation/Attachments/Attachment+URL.swift

@@ -42,13 +42,13 @@ extension UTType {
 #endif
 
 @_spi(Experimental)
-extension Test.Attachment where AttachableValue == Data {
+extension Attachment where AttachableValue == Data {
   /// Initialize an instance of this type with the contents of the given URL.
   ///
   /// - Parameters:
   ///   - url: The URL containing the attachment's data.
-  ///   - preferredName: The preferred name of the attachment when writing it
-  ///     to a test report or to disk. If `nil`, the name of the attachment is
+  ///   - preferredName: The preferred name of the attachment when writing it to
+  ///     a test report or to disk. If `nil`, the name of the attachment is
   ///     derived from the last path component of `url`.
   ///   - sourceLocation: The source location of the call to this initializer.
   ///     This value is used when recording issues associated with the

Sources/Overlays/_Testing_Foundation/Attachments/Data+Test.Attachable.swift renamed to Sources/Overlays/_Testing_Foundation/Attachments/Data+Attachable.swift

@@ -13,8 +13,8 @@
 public import Foundation
 
 @_spi(Experimental)
-extension Data: Test.Attachable {
-  public func withUnsafeBufferPointer<R>(for attachment: borrowing Test.Attachment<Self>, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R {
+extension Data: Attachable {
+  public func withUnsafeBufferPointer<R>(for attachment: borrowing Attachment<Self>, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R {
     try withUnsafeBytes(body)
   }
 }

Sources/Overlays/_Testing_Foundation/Attachments/EncodingFormat.swift

@@ -17,7 +17,7 @@ private import UniformTypeIdentifiers
 #endif
 
 /// An enumeration describing the encoding formats we support for `Encodable`
-/// and `NSSecureCoding` types that conform to `Test.Attachable`.
+/// and `NSSecureCoding` types that conform to `Attachable`.
 enum EncodingFormat {
   /// A property list format.
   ///
@@ -41,7 +41,7 @@ enum EncodingFormat {
   ///   - attachment: The attachment that will be encoded.
   ///
   /// - Throws: If the attachment's content type or media type is unsupported.
-  init(for attachment: borrowing Test.Attachment<some Test.Attachable>) throws {
+  init(for attachment: borrowing Attachment<some Attachable>) throws {
     let ext = (attachment.preferredName as NSString).pathExtension
 
 #if SWT_TARGET_OS_APPLE && canImport(UniformTypeIdentifiers)

Sources/Testing/Attachments/Attachable.swift

@@ -82,12 +82,8 @@ extension Attachable where Self: Collection, Element == UInt8 {
   // We do not provide an implementation of withUnsafeBufferPointer(for:_:) here
   // because there is no way in the standard library to statically detect if a
   // collection can provide contiguous storage (_HasContiguousBytes is not API.)
-  // If withContiguousBytesIfAvailable(_:) fails, we don't want to make a
+  // If withContiguousStorageIfAvailable(_:) fails, we don't want to make a
   // (potentially expensive!) copy of the collection.
-  //
-  // The planned Foundation cross-import overlay can provide a default
-  // implementation for collection types that conform to Foundation's
-  // ContiguousBytes protocol.
 }
 
 extension Attachable where Self: StringProtocol {

Sources/Testing/Attachments/Test.Attachable.swift

@@ -252,7 +252,7 @@ struct AttachmentTests {
       }
 
       await Test {
-        let attachment = try await Test.Attachment(contentsOf: temporaryURL)
+        let attachment = try await Attachment(contentsOf: temporaryURL)
         attachment.attach()
       }.run(configuration: configuration)
     }
@@ -280,7 +280,7 @@ struct AttachmentTests {
       }
 
       await Test {
-        let attachment = try await Test.Attachment(contentsOf: temporaryURL)
+        let attachment = try await Attachment(contentsOf: temporaryURL)
         attachment.attach()
       }.run(configuration: configuration)
     }
@@ -290,7 +290,7 @@ struct AttachmentTests {
   @Test func attachUnsupportedContentsOfURL() async throws {
     let url = try #require(URL(string: "https://www.example.com"))
     await #expect(throws: CocoaError.self) {
-      _ = try await Test.Attachment(contentsOf: url)
+      _ = try await Attachment(contentsOf: url)
     }
   }
 #endif
@@ -361,7 +361,7 @@ struct AttachmentTests {
       name = "\(name).\(ext)"
     }
 
-    func open<T>(_ attachment: borrowing Test.Attachment<T>) throws where T: Test.Attachable {
+    func open<T>(_ attachment: borrowing Attachment<T>) throws where T: Attachable {
       try attachment.attachableValue.withUnsafeBufferPointer(for: attachment) { bytes in
         #expect(bytes.first == args.firstCharacter.asciiValue)
         let decodedStringValue = try args.decode(Data(bytes))
@@ -371,19 +371,19 @@ struct AttachmentTests {
 
     if args.forSecureCoding {
       let attachableValue = MySecureCodingAttachable(string: "stringly speaking")
-      let attachment = Test.Attachment(attachableValue, named: name)
+      let attachment = Attachment(attachableValue, named: name)
       try open(attachment)
     } else {
       let attachableValue = MyCodableAttachable(string: "stringly speaking")
-      let attachment = Test.Attachment(attachableValue, named: name)
+      let attachment = Attachment(attachableValue, named: name)
       try open(attachment)
     }
   }
 
   @Test("Attach NSSecureCoding-conformant value but with a JSON type")
   func attachNSSecureCodingAsJSON() async throws {
     let attachableValue = MySecureCodingAttachable(string: "stringly speaking")
-    let attachment = Test.Attachment(attachableValue, named: "loremipsum.json")
+    let attachment = Attachment(attachableValue, named: "loremipsum.json")
     #expect(throws: CocoaError.self) {
       try attachment.attachableValue.withUnsafeBufferPointer(for: attachment) { _ in }
     }
@@ -392,7 +392,7 @@ struct AttachmentTests {
   @Test("Attach NSSecureCoding-conformant value but with a nonsensical type")
   func attachNSSecureCodingAsNonsensical() async throws {
     let attachableValue = MySecureCodingAttachable(string: "stringly speaking")
-    let attachment = Test.Attachment(attachableValue, named: "loremipsum.gif")
+    let attachment = Attachment(attachableValue, named: "loremipsum.gif")
     #expect(throws: CocoaError.self) {
       try attachment.attachableValue.withUnsafeBufferPointer(for: attachment) { _ in }
     }
@@ -491,11 +491,11 @@ struct MySendableAttachableWithDefaultByteCount: Attachable, Sendable {
 }
 
 #if canImport(Foundation)
-struct MyCodableAttachable: Codable, Test.Attachable, Sendable {
+struct MyCodableAttachable: Codable, Attachable, Sendable {
   var string: String
 }
 
-final class MySecureCodingAttachable: NSObject, NSSecureCoding, Test.Attachable, Sendable {
+final class MySecureCodingAttachable: NSObject, NSSecureCoding, Attachable, Sendable {
   let string: String
 
   init(string: String) {
@@ -515,7 +515,7 @@ final class MySecureCodingAttachable: NSObject, NSSecureCoding, Test.Attachable,
   }
 }
 
-final class MyCodableAndSecureCodingAttachable: NSObject, Codable, NSSecureCoding, Test.Attachable, Sendable {
+final class MyCodableAndSecureCodingAttachable: NSObject, Codable, NSSecureCoding, Attachable, Sendable {
   let string: String
 
   static var supportsSecureCoding: Bool {