Remove manual map implementation in maybe math (#161)

03fc090799a3b3851f229170cea4735eca593cae · ruwaq TimJentzsch · 2022-06-16T01:04:41Z (4 wata ñawpaq) · tayta d35459ebd · kay commitpi sach'ata qhaway

Semántico sayk'uy · 4

src/math.rs

ukhunpi t'ikrakurqan fn maybe_add
ukhunpi t'ikrakurqan fn maybe_max
ukhunpi t'ikrakurqan fn maybe_min
ukhunpi t'ikrakurqan fn maybe_sub

1 qillqakuna · +4 −22

src/math.rs +4 −22

diff --git a/src/math.rs b/src/math.rs
index 687192bba..cd9ad6512 100644
--- a/src/math.rs
+++ b/src/math.rs
@@ -57,38 +57,20 @@ impl MaybeMath<Option<f32>, Option<f32>> for Option<f32> {
 }
 
 impl MaybeMath<f32, Option<f32>> for Option<f32> {
-    // The logic here is subtle and critical;
-    // explicit match statements make it more clear what's going on
-    #[allow(clippy::manual_map)]
     fn maybe_min(self, rhs: f32) -> Option<f32> {
-        match self {
-            Some(val) => Some(val.min(rhs)),
-            None => None,
-        }
+        self.map(|val| val.min(rhs))
     }
 
-    #[allow(clippy::manual_map)]
     fn maybe_max(self, rhs: f32) -> Option<f32> {
-        match self {
-            Some(val) => Some(val.max(rhs)),
-            None => None,
-        }
+        self.map(|val| val.max(rhs))
     }
 
-    #[allow(clippy::manual_map)]
     fn maybe_add(self, rhs: f32) -> Option<f32> {
-        match self {
-            Some(val) => Some(val + rhs),
-            None => None,
-        }
+        self.map(|val| val + rhs)
     }
 
-    #[allow(clippy::manual_map)]
     fn maybe_sub(self, rhs: f32) -> Option<f32> {
-        match self {
-            Some(val) => Some(val - rhs),
-            None => None,
-        }
+        self.map(|val| val - rhs)
     }
 }