Make record iterator call more idiomatic with unwrap_or_else

2 files changed, 6 insertions, 12 deletions

diff --git a/log_db/src/log_reader_forward.rs b/log_db/src/log_reader_forward.rs
index 8063918..fc824b2 100644
--- a/log_db/src/log_reader_forward.rs
+++ b/log_db/src/log_reader_forward.rs
@@ -87,11 +87,9 @@ impl Iterator for ForwardLogReader {
     type Item = ForwardLogReaderItem;
 
     fn next(&mut self) -> Option<Self::Item> {
-        match self.read_record() {
-            Ok(Some(record)) => Some(record),
-            Ok(None) => None,
-            Err(err) => panic!("Error reading record: {:?}", err),
-        }
+        self.read_record().unwrap_or_else(|err| {
+            panic!("Error reading record: {:?}", err);
+        })
     }
 }
 
diff --git a/log_db/src/log_reader_reverse.rs b/log_db/src/log_reader_reverse.rs
index 0c95322..ef2b0dc 100644
--- a/log_db/src/log_reader_reverse.rs
+++ b/log_db/src/log_reader_reverse.rs
@@ -111,12 +111,8 @@ impl Iterator for ReverseLogReader {
     type Item = Record;
 
     fn next(&mut self) -> Option<Self::Item> {
-        match self.read_record() {
-            Ok(Some(record)) => Some(record),
-            Ok(None) => None,
-            Err(err) => {
-                panic!("Error reading record: {:?}", err)
-            }
-        }
+        self.read_record().unwrap_or_else(|err| {
+            panic!("Error reading record: {:?}", err);
+        })
     }
 }