Make rect(toFit:...) and rect(toFill:...) have similar API surface

Paralayout/AspectRatio.swift

@@ -219,22 +219,20 @@ public struct AspectRatio: Comparable, CustomDebugStringConvertible, Sendable {
     /// - parameter rect: The bounding rect.
     /// - parameter position: The location within the bounding rect for the new rect, determining where margin(s) will
     /// be if the aspect ratios do not match perfectly.
-    /// - parameter scaleFactor: The view/window/screen to use for pixel alignment.
-    /// - parameter layoutDirection: The effective layout direction of the view in which the `rect` is defined.
+    /// - parameter context: The view/window/screen that provides the scale factor and effective layout direction in
+    /// which the rect should be positioned.
     /// - returns: A rect with the receiver's aspect ratio, strictly within the bounding rect.
     @MainActor
     public func rect(
         toFit rect: CGRect,
         at position: Position,
-        in scaleFactor: ScaleFactorProviding,
-        layoutDirection: UIUserInterfaceLayoutDirection
+        in context: (ScaleFactorProviding & LayoutDirectionProviding)
     ) -> CGRect {
-        CGRect(
-            size: size(toFit: rect.size, in: scaleFactor),
+        self.rect(
+            toFit: rect,
             at: position,
-            of: rect,
-            in: scaleFactor,
-            layoutDirection: layoutDirection
+            in: context.pixelsPerPoint,
+            layoutDirection: context.effectiveUserInterfaceLayoutDirection
         )
     }
 
@@ -302,22 +300,20 @@ public struct AspectRatio: Comparable, CustomDebugStringConvertible, Sendable {
     /// - parameter rect: The bounding rect.
     /// - parameter position: The location within the bounding rect for the new rect, determining where margin(s) will
     /// be if the aspect ratios do not match perfectly.
-    /// - parameter scaleFactor: The view/window/screen to use for pixel alignment.
-    /// - parameter layoutDirection: The effective layout direction of the view in which the `rect` is defined.
+    /// - parameter context: The view/window/screen that provides the scale factor and effective layout direction in
+    /// which the rect should be positioned.
     /// - returns: A rect with the receiver's aspect ratio, strictly containing the bounding rect.
     @MainActor
     public func rect(
         toFill rect: CGRect,
         at position: Position,
-        in scaleFactor: ScaleFactorProviding,
-        layoutDirection: UIUserInterfaceLayoutDirection
+        in context: (ScaleFactorProviding & LayoutDirectionProviding)
     ) -> CGRect {
-        CGRect(
-            size: size(toFill: rect.size, in: scaleFactor),
+        self.rect(
+            toFill: rect,
             at: position,
-            of: rect,
-            in: scaleFactor,
-            layoutDirection: layoutDirection
+            in: context.pixelsPerPoint,
+            layoutDirection: context.effectiveUserInterfaceLayoutDirection
         )
     }
 
@@ -345,29 +341,6 @@ public struct AspectRatio: Comparable, CustomDebugStringConvertible, Sendable {
         )
     }
 
-    /// An "aspect-fill" function that determines the smallest rect of the receiver's aspect ratio that fits a rect
-    /// within it.
-    ///
-    /// - parameter rect: The bounding rect.
-    /// - parameter position: The location within the bounding rect for the new rect, determining where margin(s) will
-    /// be if the aspect ratios do not match perfectly.
-    /// - parameter context: The view/window/screen that provides the scale factor and effective layout direction in
-    /// which the rect should be positioned.
-    /// - returns: A rect with the receiver's aspect ratio, strictly containing the bounding rect.
-    @MainActor
-    public func rect(
-        toFill rect: CGRect,
-        at position: Position,
-        in context: (ScaleFactorProviding & LayoutDirectionProviding)
-    ) -> CGRect {
-        self.rect(
-            toFill: rect,
-            at: position,
-            in: context,
-            layoutDirection: context.effectiveUserInterfaceLayoutDirection
-        )
-    }
-
 }
 
 // MARK: -

ParalayoutTests/AspectRatioTests.swift

@@ -142,7 +142,7 @@ final class AspectRatioTests: XCTestCase {
 
             // An AspectRatio's size that fits a rect of the same aspect ratio should also be the same as the size of
             // that rect.
-            let rectToFit = ratio.rect(toFit: rect, at: position, in: ScaleFactorProvider(scale), layoutDirection: layoutDirection)
+            let rectToFit = ratio.rect(toFit: rect, at: position, in: scale, layoutDirection: layoutDirection)
             XCTAssert(rectToFit.size == ratio.size(toFit: rect.size, in: scale))
 
             // The rect needs to be positioned as requested (within a pixel).
@@ -170,7 +170,7 @@ final class AspectRatioTests: XCTestCase {
             let rectToFill = ratio.rect(
                 toFill: rect,
                 at: position,
-                in: ScaleFactorProvider(scale),
+                in: scale,
                 layoutDirection: layoutDirection
             )
             XCTAssert(rectToFill.size == ratio.size(toFill: rect.size, in: scale))