Merge pull request #667 from 10ne1/dev/aratiu/fix-irrefutable-let-warn

AaronErhardt · web-flow · commit 0f195eadaac7 · 2025-03-27T11:55:35.000-06:00
coord: ranged1d: fix irrefutable if let warning
diff --git a/plotters/src/coord/ranged1d/types/numeric.rs b/plotters/src/coord/ranged1d/types/numeric.rs
@@ -26,10 +26,9 @@ macro_rules! impl_discrete_trait {
             }
 
             fn from_index(&self, index: usize) -> Option<Self::ValueType> {
-                if let Ok(index) = Self::ValueType::try_from(index) {
-                    return Some(self.0 + index);
-                }
-                None
+                Self::ValueType::try_from(index)
+                    .ok()
+                    .and_then(|index| self.0.checked_add(index))
             }
         }
     };

Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,9 @@ macro_rules! impl_discrete_trait {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`fn from_index(&self, index: usize) -> Option<Self::ValueType> {`
`29`		`- if let Ok(index) = Self::ValueType::try_from(index) {`
`30`		`- return Some(self.0 + index);`
`31`		`- }`
`32`		`- None`
	`29`	`+ Self::ValueType::try_from(index)`
	`30`	`+ .ok()`
	`31`	`+ .and_then(\|index\| self.0.checked_add(index))`
`33`	`32`	`}`
`34`	`33`	`}`
`35`	`34`	`};`