From 2cc6865c908d025e43d7fc937f6b67defd51ea18 Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Wed, 11 Dec 2024 14:37:17 -0500 Subject: [PATCH] fix: use total_cmp where possible --- core/src/gradient.rs | 2 +- graphics/src/damage.rs | 3 +-- graphics/src/gradient.rs | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/src/gradient.rs b/core/src/gradient.rs index ccae0bcef7..722c3c5c20 100644 --- a/core/src/gradient.rs +++ b/core/src/gradient.rs @@ -70,7 +70,7 @@ impl Linear { let (Ok(index) | Err(index)) = self.stops.binary_search_by(|stop| match stop { None => Ordering::Greater, - Some(stop) => stop.offset.partial_cmp(&offset).unwrap(), + Some(stop) => stop.offset.total_cmp(&offset), }); if index < 8 { diff --git a/graphics/src/damage.rs b/graphics/src/damage.rs index 17d6045195..c8ea1449b0 100644 --- a/graphics/src/damage.rs +++ b/graphics/src/damage.rs @@ -52,8 +52,7 @@ pub fn group(mut damage: Vec, bounds: Rectangle) -> Vec { damage.sort_by(|a, b| { a.center() .distance(Point::ORIGIN) - .partial_cmp(&b.center().distance(Point::ORIGIN)) - .unwrap_or(Ordering::Equal) + .total_cmp(&b.center().distance(Point::ORIGIN)) }); let mut output = Vec::new(); diff --git a/graphics/src/gradient.rs b/graphics/src/gradient.rs index 542617214a..95593c59ec 100644 --- a/graphics/src/gradient.rs +++ b/graphics/src/gradient.rs @@ -67,7 +67,7 @@ impl Linear { let (Ok(index) | Err(index)) = self.stops.binary_search_by(|stop| match stop { None => Ordering::Greater, - Some(stop) => stop.offset.partial_cmp(&offset).unwrap(), + Some(stop) => stop.offset.total_cmp(&offset), }); if index < 8 {