From c914b2a05be2c33ec936f63efd25daaf2b4c4739 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 15 Sep 2021 15:08:35 +0700
Subject: Use `Iterator::min_by` instead of `fold` in `hit_test`

---
 wgpu/src/text.rs | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'wgpu')

diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 34fd5b58..336696ee 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -195,20 +195,18 @@ impl Pipeline {
             }
         }
 
-        let (idx, nearest) = bounds.fold(
-            (None, iced_native::Point::ORIGIN),
-            |best, (idx, bounds)| {
-                let center = bounds.center();
-
-                if center.distance(point) < best.1.distance(point) {
-                    (Some(idx), center)
-                } else {
-                    best
-                }
-            },
-        );
+        let nearest = bounds
+            .map(|(index, bounds)| (index, bounds.center()))
+            .min_by(|(_, center_a), (_, center_b)| {
+                center_a
+                    .distance(point)
+                    .partial_cmp(&center_b.distance(point))
+                    .unwrap_or(std::cmp::Ordering::Greater)
+            });
 
-        idx.map(|idx| Hit::NearestCharOffset(char_index(idx), point - nearest))
+        nearest.map(|(idx, center)| {
+            Hit::NearestCharOffset(char_index(idx), point - center)
+        })
     }
 
     pub fn trim_measurement_cache(&mut self) {
-- 
cgit