Align set rule

2 files changed, 12 insertions, 18 deletions

diff --git a/src/geom/corners.rs b/src/geom/corners.rs
index d84160cc..386acbfb 100644
--- a/src/geom/corners.rs
+++ b/src/geom/corners.rs
@@ -45,16 +45,13 @@ impl<T> Corners<T> {
         }
     }
 
-    /// Zip two instances into an instance.
-    pub fn zip<F, V, W>(self, other: Corners<V>, mut f: F) -> Corners<W>
-    where
-        F: FnMut(T, V) -> W,
-    {
+    /// Zip two instances into one.
+    pub fn zip<U>(self, other: Corners<U>) -> Corners<(T, U)> {
         Corners {
-            top_left: f(self.top_left, other.top_left),
-            top_right: f(self.top_right, other.top_right),
-            bottom_right: f(self.bottom_right, other.bottom_right),
-            bottom_left: f(self.bottom_left, other.bottom_left),
+            top_left: (self.top_left, other.top_left),
+            top_right: (self.top_right, other.top_right),
+            bottom_right: (self.bottom_right, other.bottom_right),
+            bottom_left: (self.bottom_left, other.bottom_left),
         }
     }
 
diff --git a/src/geom/sides.rs b/src/geom/sides.rs
index 9b8d9a6b..40327a42 100644
--- a/src/geom/sides.rs
+++ b/src/geom/sides.rs
@@ -45,16 +45,13 @@ impl<T> Sides<T> {
         }
     }
 
-    /// Zip two instances into an instance.
-    pub fn zip<F, V, W>(self, other: Sides<V>, mut f: F) -> Sides<W>
-    where
-        F: FnMut(T, V) -> W,
-    {
+    /// Zip two instances into one.
+    pub fn zip<U>(self, other: Sides<U>) -> Sides<(T, U)> {
         Sides {
-            left: f(self.left, other.left),
-            top: f(self.top, other.top),
-            right: f(self.right, other.right),
-            bottom: f(self.bottom, other.bottom),
+            left: (self.left, other.left),
+            top: (self.top, other.top),
+            right: (self.right, other.right),
+            bottom: (self.bottom, other.bottom),
         }
     }