!simplify

Author: Hywan

crates/matrix-sdk/src/event_cache/store.rs

@@ -542,16 +542,13 @@ pub mod experimental {
         type Item = (ChunkPosition, &'a Chunk<T, C>);
 
         fn next(&mut self) -> Option<Self::Item> {
-            let Some(chunk) = self.chunk else {
-                return None;
-            };
-
-            let position = self.position;
-
-            self.chunk = chunk.previous();
-            self.position += 1;
+            self.chunk.map(|chunk| {
+                let position = self.position;
+                self.chunk = chunk.previous();
+                self.position += 1;
 
-            Some((position, chunk))
+                (position, chunk)
+            })
         }
     }
 
@@ -573,16 +570,13 @@ pub mod experimental {
         type Item = (ChunkPosition, &'a Chunk<T, C>);
 
         fn next(&mut self) -> Option<Self::Item> {
-            let Some(chunk) = self.chunk else {
-                return None;
-            };
-
-            let position = self.position;
-
-            self.chunk = chunk.next();
-            self.position = self.position.saturating_sub(1);
+            self.chunk.map(|chunk| {
+                let position = self.position;
+                self.chunk = chunk.next();
+                self.position = self.position.saturating_sub(1);
 
-            Some((position, chunk))
+                (position, chunk)
+            })
         }
     }