Rewrite MapForGrouping Iterator::next implementation using Option::map

SkiFire13 · SkiFire13 · commit 4d7a2d0d7b6b · 2020-07-22T22:35:53.000+02:00
diff --git a/src/grouping_map.rs b/src/grouping_map.rs
@@ -23,8 +23,7 @@ impl<K, V, I, F> Iterator for MapForGrouping<I, F>
 {
     type Item = (K, V);
     fn next(&mut self) -> Option<Self::Item> {
-        let val = self.0.next()?;
-        Some(((self.1)(&val), val))
+        self.0.next().map(|val| ((self.1)(&val), val))
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,7 @@ impl<K, V, I, F> Iterator for MapForGrouping<I, F>`
`23`	`23`	`{`
`24`	`24`	`type Item = (K, V);`
`25`	`25`	`fn next(&mut self) -> Option<Self::Item> {`
`26`		`- let val = self.0.next()?;`
`27`		`- Some(((self.1)(&val), val))`
	`26`	`+ self.0.next().map(\|val\| ((self.1)(&val), val))`
`28`	`27`	`}`
`29`	`28`	`}`
`30`	`29`