Refactor IntersperseWith::next

rust-itertools · Nov 13, 2023 · 4f22173 · 4f22173
1 parent b76172b
commit 4f22173
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/src/intersperse.rs b/src/intersperse.rs
@@ -78,15 +78,20 @@ where
     type Item = I::Item;
     #[inline]
     fn next(&mut self) -> Option<Self::Item> {
-        if self.peek.is_some() {
-            self.peek.take()
-        } else {
-            self.peek = self.iter.next();
-            if self.peek.is_some() {
-                Some(self.element.generate())
-            } else {
-                None
-            }
+        let Self {
+            element,
+            iter,
+            peek,
+        } = self;
+        match peek {
+            item @ Some(_) => item.take(),
+            None => match iter.next() {
+                new @ Some(_) => {
+                    *peek = new;
+                    Some(element.generate())
+                }
+                None => None,
+            },
         }
     }