Merge branch 'main' into jgrynspan/162-redesign-value-capture

Author: grynspan

.github/workflows/pull_request.yml

@@ -24,6 +24,6 @@ jobs:
     uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
     with:
       license_header_check_project_name: "Swift"
-      docs_check_container_image: "swift:6.2-noble"
+      docs_check_enabled: false
       format_check_enabled: false
       api_breakage_check_enabled: false

Package.swift

@@ -391,6 +391,7 @@ extension Array where Element == PackageDescription.SwiftSetting {
       .define("SWT_NO_DYNAMIC_LINKING", .whenEmbedded(or: .when(platforms: [.wasi]))),
       .define("SWT_NO_PIPES", .whenEmbedded(or: .when(platforms: [.wasi]))),
       .define("SWT_NO_FOUNDATION_FILE_COORDINATION", .whenEmbedded(or: .whenApple(false))),
+      .define("SWT_NO_IMAGE_ATTACHMENTS", .whenEmbedded(or: .when(platforms: [.linux, .custom("freebsd"), .openbsd, .wasi, .android]))),
 
       .define("SWT_NO_LEGACY_TEST_DISCOVERY", .whenEmbedded()),
       .define("SWT_NO_LIBDISPATCH", .whenEmbedded()),

Sources/Overlays/_Testing_CoreGraphics/Attachments/AttachableAsCGImage.swift

@@ -39,7 +39,7 @@ private import ImageIO
 ///   @Available(Swift, introduced: 6.3)
 /// }
 @available(_uttypesAPI, *)
-public protocol AttachableAsCGImage: SendableMetatype {
+public protocol AttachableAsCGImage: _AttachableAsImage, SendableMetatype {
   /// An instance of `CGImage` representing this image.
   ///
   /// - Throws: Any error that prevents the creation of an image.
@@ -68,22 +68,6 @@ public protocol AttachableAsCGImage: SendableMetatype {
   /// This property is not part of the public interface of the testing
   /// library. It may be removed in a future update.
   var _attachmentScaleFactor: CGFloat { get }
-
-  /// Make a copy of this instance to pass to an attachment.
-  ///
-  /// - Returns: A copy of `self`, or `self` if no copy is needed.
-  ///
-  /// The testing library uses this function to take ownership of image
-  /// resources that test authors pass to it. If possible, make a copy of or add
-  /// a reference to `self`. If this type does not support making copies, return
-  /// `self` verbatim.
-  ///
-  /// The default implementation of this function when `Self` conforms to
-  /// `Sendable` simply returns `self`.
-  ///
-  /// This function is not part of the public interface of the testing library.
-  /// It may be removed in a future update.
-  func _copyAttachableValue() -> Self
 }
 
 @available(_uttypesAPI, *)
@@ -95,6 +79,8 @@ extension AttachableAsCGImage {
   public var _attachmentScaleFactor: CGFloat {
     1.0
   }
+
+  public func _deinitializeAttachableValue() {}
 }
 
 @available(_uttypesAPI, *)

Sources/Overlays/_Testing_CoreGraphics/CMakeLists.txt

@@ -11,7 +11,6 @@ if(APPLE)
     Attachments/_AttachableImageWrapper+AttachableWrapper.swift
     Attachments/AttachableAsCGImage.swift
     Attachments/AttachableImageFormat+UTType.swift
-    Attachments/Attachment+AttachableAsCGImage.swift
     Attachments/CGImage+AttachableAsCGImage.swift
     ReexportTesting.swift)
 

Sources/Overlays/_Testing_WinSDK/Attachments/AttachableAsIWICBitmapSource.swift

@@ -113,7 +113,7 @@ public protocol _AttachableByAddressAsIWICBitmapSource {
 /// you have an image in another format that needs to be attached to a test,
 /// first convert it to an instance of one of the types above.
 @_spi(Experimental)
-public protocol AttachableAsIWICBitmapSource: SendableMetatype {
+public protocol AttachableAsIWICBitmapSource: _AttachableAsImage, SendableMetatype {
   /// Create a WIC bitmap source representing an instance of this type.
   ///
   /// - Returns: A pointer to a new WIC bitmap source representing this image.
@@ -145,39 +145,6 @@ public protocol AttachableAsIWICBitmapSource: SendableMetatype {
   func _copyAttachableIWICBitmapSource(
     using factory: UnsafeMutablePointer<IWICImagingFactory>
   ) throws -> UnsafeMutablePointer<IWICBitmapSource>
-
-  /// Make a copy of this instance.
-  ///
-  /// - Returns: A copy of `self`, or `self` if this type does not support a
-  ///   copying operation.
-  ///
-  /// The testing library uses this function to take ownership of image
-  /// resources that test authors pass to it. If possible, make a copy of or add
-  /// a reference to `self`. If this type does not support making copies, return
-  /// `self` verbatim.
-  ///
-  /// The default implementation of this function when `Self` conforms to
-  /// `Sendable` simply returns `self`.
-  ///
-  /// This function is not part of the public interface of the testing library.
-  /// It may be removed in a future update.
-  func _copyAttachableValue() -> Self
-
-  /// Manually deinitialize any resources associated with this image.
-  ///
-  /// The implementation of this function cleans up any resources (such as
-  /// handles or COM objects) associated with this image. The testing library
-  /// automatically invokes this function as needed.
-  ///
-  /// This function is not responsible for releasing the image returned from
-  /// `_copyAttachableIWICBitmapSource(using:)`.
-  ///
-  /// The default implementation of this function when `Self` conforms to
-  /// `Sendable` does nothing.
-  ///
-  /// This function is not part of the public interface of the testing library.
-  /// It may be removed in a future update.
-  func _deinitializeAttachableValue()
 }
 
 extension AttachableAsIWICBitmapSource {
@@ -187,12 +154,4 @@ extension AttachableAsIWICBitmapSource {
     try copyAttachableIWICBitmapSource()
   }
 }
-
-extension AttachableAsIWICBitmapSource where Self: Sendable {
-  public func _copyAttachableValue() -> Self {
-    self
-  }
-
-  public func _deinitializeAttachableValue() {}
-}
 #endif

Sources/Overlays/_Testing_WinSDK/Attachments/Attachment+AttachableAsIWICBitmapSource.swift

@@ -13,7 +13,7 @@ private import Testing
 public import WinSDK
 
 @_spi(Experimental)
-extension UnsafeMutablePointer: AttachableAsIWICBitmapSource where Pointee: _AttachableByAddressAsIWICBitmapSource {
+extension UnsafeMutablePointer: _AttachableAsImage, AttachableAsIWICBitmapSource where Pointee: _AttachableByAddressAsIWICBitmapSource {
   public func copyAttachableIWICBitmapSource() throws -> UnsafeMutablePointer<IWICBitmapSource> {
     let factory = try IWICImagingFactory.create()
     defer {
@@ -30,7 +30,7 @@ extension UnsafeMutablePointer: AttachableAsIWICBitmapSource where Pointee: _Att
     Pointee._copyAttachableValue(at: self)
   }
 
-  public consuming func _deinitializeAttachableValue() {
+  public func _deinitializeAttachableValue() {
     Pointee._deinitializeAttachableValue(at: self)
   }
 }

Sources/Overlays/_Testing_WinSDK/Attachments/UnsafeMutablePointer+AttachableAsIWICBitmapSource.swift

@@ -11,7 +11,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
     Attachments/_AttachableImageWrapper+AttachableWrapper.swift
     Attachments/AttachableAsIWICBitmapSource.swift
     Attachments/AttachableImageFormat+CLSID.swift
-    Attachments/Attachment+AttachableAsIWICBitmapSource.swift
     Attachments/HBITMAP+AttachableAsIWICBitmapSource.swift
     Attachments/HICON+AttachableAsIWICBitmapSource.swift
     Attachments/IWICBitmapSource+AttachableAsIWICBitmapSource.swift

Sources/Overlays/_Testing_WinSDK/CMakeLists.txt

@@ -31,6 +31,9 @@
 /// @Metadata {
 ///   @Available(Swift, introduced: 6.3)
 /// }
+#if SWT_NO_IMAGE_ATTACHMENTS
+@available(*, unavailable, message: "Image attachments are not available on this platform.")
+#endif
 @available(_uttypesAPI, *)
 public struct AttachableImageFormat: Sendable {
   /// An enumeration describing the various kinds of image format that can be
@@ -77,6 +80,9 @@ public struct AttachableImageFormat: Sendable {
 
 // MARK: -
 
+#if SWT_NO_IMAGE_ATTACHMENTS
+@available(*, unavailable, message: "Image attachments are not available on this platform.")
+#endif
 @available(_uttypesAPI, *)
 extension AttachableImageFormat {
   /// The PNG image format.

Sources/Testing/Attachments/Images/AttachableImageFormat.swift

@@ -8,9 +8,9 @@
 // See https://swift.org/CONTRIBUTORS.txt for Swift project authors
 //
 
-#if SWT_TARGET_OS_APPLE && canImport(CoreGraphics)
-public import Testing
-
+#if SWT_NO_IMAGE_ATTACHMENTS
+@available(*, unavailable, message: "Image attachments are not available on this platform.")
+#endif
 @available(_uttypesAPI, *)
 extension Attachment {
   /// Initialize an instance of this type that encloses the given image.
@@ -52,12 +52,8 @@ extension Attachment {
     named preferredName: String? = nil,
     as imageFormat: AttachableImageFormat? = nil,
     sourceLocation: SourceLocation = #_sourceLocation
-  ) where T: AttachableAsCGImage, AttachableValue == _AttachableImageWrapper<T> {
-    let imageWrapper = _AttachableImageWrapper(
-      image: image._copyAttachableValue(),
-      imageFormat: imageFormat,
-      deinitializingWith: { _ in }
-    )
+  ) where AttachableValue: _AttachableImageWrapper<T> & AttachableWrapper {
+    let imageWrapper = AttachableValue(image: image, imageFormat: imageFormat)
     self.init(imageWrapper, named: preferredName, sourceLocation: sourceLocation)
   }
 
@@ -99,7 +95,7 @@ extension Attachment {
     named preferredName: String? = nil,
     as imageFormat: AttachableImageFormat? = nil,
     sourceLocation: SourceLocation = #_sourceLocation
-  ) where T: AttachableAsCGImage, AttachableValue == _AttachableImageWrapper<T> {
+  ) where AttachableValue: _AttachableImageWrapper<T> & AttachableWrapper {
     let attachment = Self(image, named: preferredName, as: imageFormat, sourceLocation: sourceLocation)
     Self.record(attachment, sourceLocation: sourceLocation)
   }
@@ -108,12 +104,14 @@ extension Attachment {
 // MARK: -
 
 @_spi(Experimental) // STOP: not part of ST-0014
+#if SWT_NO_IMAGE_ATTACHMENTS
+@available(*, unavailable, message: "Image attachments are not available on this platform.")
+#endif
 @available(_uttypesAPI, *)
-extension Attachment where AttachableValue: AttachableWrapper, AttachableValue.Wrapped: AttachableAsCGImage {
+extension Attachment where AttachableValue: AttachableWrapper, AttachableValue.Wrapped: _AttachableAsImage {
   /// The image format to use when encoding the represented image.
   @_disfavoredOverload public var imageFormat: AttachableImageFormat? {
     // FIXME: no way to express `where AttachableValue == _AttachableImageWrapper<???>` on a property (see rdar://47559973)
     (attachableValue as? _AttachableImageWrapper<AttachableValue.Wrapped>)?.imageFormat
   }
 }
-#endif