From 07c593d9b836232c2d9bbe986baaa3099edddbb4 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Fri, 10 Jan 2025 15:20:17 +0200 Subject: Make record iterator call more idiomatic with unwrap_or_else --- log_db/src/log_reader_forward.rs | 8 +++----- log_db/src/log_reader_reverse.rs | 10 +++------- 2 files changed, 6 insertions(+), 12 deletions(-) (limited to 'log_db/src') 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 { - 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 { - 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); + }) } } -- cgit v1.3