Incorporate feedback

Author: grynspan

Sources/Overlays/_Testing_CoreGraphics/Attachments/Attachment+AttachableAsCGImage.swift

@@ -39,7 +39,7 @@ extension Attachment {
   fileprivate init<T>(
     attachableValue: T,
     named preferredName: String?,
-    as contentType: (any Sendable)?,
+    contentType: (any Sendable)?,
     encodingQuality: Float,
     sourceLocation: SourceLocation
   ) where AttachableValue == _AttachableImageContainer<T> {
@@ -111,7 +111,7 @@ extension Attachment {
     encodingQuality: Float = 1.0,
     sourceLocation: SourceLocation = #_sourceLocation
   ) where AttachableValue == _AttachableImageContainer<T> {
-    self.init(attachableValue: attachableValue, named: preferredName, as: contentType, encodingQuality: encodingQuality, sourceLocation: sourceLocation)
+    self.init(attachableValue: attachableValue, named: preferredName, contentType: contentType, encodingQuality: encodingQuality, sourceLocation: sourceLocation)
   }
 
   /// Initialize an instance of this type that encloses the given image.
@@ -141,7 +141,7 @@ extension Attachment {
     encodingQuality: Float = 1.0,
     sourceLocation: SourceLocation = #_sourceLocation
   ) where AttachableValue == _AttachableImageContainer<T> {
-    self.init(attachableValue: attachableValue, named: preferredName, as: nil, encodingQuality: encodingQuality, sourceLocation: sourceLocation)
+    self.init(attachableValue: attachableValue, named: preferredName, contentType: nil, encodingQuality: encodingQuality, sourceLocation: sourceLocation)
   }
 }
 #endif

Sources/Overlays/_Testing_CoreGraphics/Attachments/ImageAttachmentError.swift

@@ -9,7 +9,7 @@
 //
 
 #if SWT_TARGET_OS_APPLE && canImport(CoreGraphics)
-/// A type representing errors that can occur when attaching an image.
+/// A type representing an error that can occur when attaching an image.
 package enum ImageAttachmentError: Error, CustomStringConvertible {
   /// The specified content type did not conform to `.image`.
   case contentTypeDoesNotConformToImage

Sources/Overlays/_Testing_CoreGraphics/Attachments/_AttachableImageContainer.swift

@@ -25,7 +25,7 @@ import UniformTypeIdentifiers
 ///    to eagerly serialize them, which is unnecessarily expensive if we know
 ///    they're actually concurrency-safe.
 /// 2. We would have no place to store metadata such as the encoding quality
-/// 	 (although in the future we may introduce a "metadata" associated type to
+///    (although in the future we may introduce a "metadata" associated type to
 ///    `Attachable` that could store that info.)
 /// 3. `Attachable` has a requirement with `Self` in non-parameter, non-return
 ///    position. As far as Swift is concerned, a non-final class cannot satisfy
@@ -48,14 +48,14 @@ import UniformTypeIdentifiers
 ///
 /// - [`CGImage`](https://developer.apple.com/documentation/coregraphics/cgimage)
 @_spi(Experimental)
-public struct _AttachableImageContainer<ImageClass>: Sendable where ImageClass: AttachableAsCGImage {
+public struct _AttachableImageContainer<Image>: Sendable where Image: AttachableAsCGImage {
   /// The underlying image.
   ///
   /// `CGImage` and `UIImage` are sendable, but `NSImage` is not. `NSImage`
   /// instances can be created from closures that are run at rendering time.
   /// The AppKit cross-import overlay is responsible for ensuring that any
   /// instances of this type it creates hold "safe" `NSImage` instances.
-  nonisolated(unsafe) var image: ImageClass
+  nonisolated(unsafe) var image: Image
 
   /// The encoding quality to use when encoding the represented image.
   public var encodingQuality: Float
@@ -77,7 +77,7 @@ public struct _AttachableImageContainer<ImageClass>: Sendable where ImageClass:
     }
   }
 
-  init(image: ImageClass, encodingQuality: Float) {
+  init(image: Image, encodingQuality: Float) {
     self.image = image._makeCopyForAttachment()
     self.encodingQuality = encodingQuality
   }
@@ -106,7 +106,7 @@ extension UTType {
 }
 
 extension _AttachableImageContainer: AttachableContainer {
-  public var attachableValue: ImageClass {
+  public var attachableValue: Image {
     image
   }