chore: replace mem::swap on Option with Option::take

mobiusklein · Oct 17, 2024 · 710653a · 710653a
1 parent 93c19a9
commit 710653a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 25 deletions.
diff --git a/src/io/compression.rs b/src/io/compression.rs
@@ -39,9 +39,7 @@ impl<R: BufRead + Seek> RestartableGzDecoder<R> {
     }
 
     fn reset(&mut self) -> io::Result<u64> {
-        let mut handle = None;
-        swap(&mut self.handle, &mut handle);
-        let handle = handle.unwrap();
+        let handle = self.handle.take().unwrap();
         let mut inner = handle.into_inner();
         let res = inner.seek(io::SeekFrom::Start(0));
         self.handle = Some(MultiGzDecoder::new(inner));

diff --git a/src/io/mzml/async.rs b/src/io/mzml/async.rs
@@ -251,9 +251,7 @@ impl<
         match self.state {
             MzMLParserState::SpectrumDone => Ok(()),
             MzMLParserState::ParserError => {
-                let mut error = None;
-                mem::swap(&mut error, &mut self.error);
-                Err(error.unwrap())
+                Err(self.error.take().unwrap_or_else(|| MzMLParserError::UnknownError(MzMLParserState::ParserError)))
             }
             _ => Err(MzMLParserError::IncompleteSpectrum),
         }
@@ -275,7 +273,7 @@ impl<
                         Ok(state) => {
                             match state {
                                 MzMLParserState::ParserError => {
-                                    eprintln!(
+                                    warn!(
                                         "Encountered an error while starting {:?}",
                                         String::from_utf8_lossy(&self.buffer)
                                     );
@@ -369,12 +367,10 @@ impl<
         match self.state {
             MzMLParserState::SpectrumDone => Ok((offset, accumulator)),
             MzMLParserState::ParserError if self.error.is_some() => {
-                let mut error = None;
-                mem::swap(&mut error, &mut self.error);
-                Err(error.unwrap())
+                Err(self.error.take().unwrap())
             }
             MzMLParserState::ParserError if self.error.is_none() => {
-                eprintln!(
+                warn!(
                     "Terminated with ParserError but no error set: {:?}",
                     self.error
                 );
@@ -397,10 +393,10 @@ impl<
                 self.state = MzMLParserState::Resume;
             },
             MzMLParserState::ParserError => {
-                eprintln!("Starting parsing from error: {:?}", self.error);
+                warn!("Starting parsing from error: {:?}", self.error);
             }
             state if state > MzMLParserState::SpectrumDone => {
-                eprintln!("Attempting to start parsing a spectrum in state {}", self.state);
+                warn!("Attempting to start parsing a spectrum in state {}", self.state);
             }
             _ => {}
         }

diff --git a/src/io/mzml/reader.rs b/src/io/mzml/reader.rs
@@ -1208,9 +1208,7 @@ impl<
         match self.state {
             MzMLParserState::SpectrumDone | MzMLParserState::ChromatogramDone => Ok(()),
             MzMLParserState::ParserError => {
-                let mut error = None;
-                mem::swap(&mut error, &mut self.error);
-                Err(error.unwrap())
+                Err(self.error.take().unwrap_or_else(|| MzMLParserError::UnknownError(MzMLParserState::ParserError)))
             }
             _ => Err(MzMLParserError::IncompleteSpectrum),
         }
@@ -1243,7 +1241,7 @@ impl<
                         Ok(state) => {
                             self.state = state;
                             if state == MzMLParserState::ParserError {
-                                eprintln!(
+                                warn!(
                                     "Encountered an error while starting {:?}",
                                     String::from_utf8_lossy(&self.buffer)
                                 );
@@ -1341,12 +1339,10 @@ impl<
                 Ok((accumulator, offset))
             }
             MzMLParserState::ParserError if self.error.is_some() => {
-                let mut error = None;
-                mem::swap(&mut error, &mut self.error);
-                Err(error.unwrap())
+                Err(self.error.take().unwrap())
             }
             MzMLParserState::ParserError if self.error.is_none() => {
-                eprintln!(
+                warn!(
                     "Terminated with ParserError but no error set: {:?}",
                     self.error
                 );
@@ -1411,13 +1407,13 @@ impl<
                 self.state = MzMLParserState::Resume;
             }
             MzMLParserState::ParserError => {
-                eprintln!("Starting parsing from error: {:?}", self.error);
+                warn!("Starting parsing from error: {:?}", self.error);
             }
             state
                 if state > MzMLParserState::ChromatogramDone
                     && state < MzMLParserState::Chromatogram =>
             {
-                eprintln!(
+                warn!(
                     "Attempting to start parsing a spectrum in state {}",
                     self.state
                 );
@@ -1877,7 +1873,7 @@ impl<
                                         b"id" => {
                                             let scan_id = attr
                                                 .unescape_value()
-                                                .expect("Error decoding id")
+                                                .expect("Error decoding spectrum id in streaming mzML index")
                                                 .to_string();
                                             // This count is off by 2 because somehow the < and > bytes are removed?
                                             self.spectrum_index.insert(
@@ -2393,7 +2389,7 @@ mod test {
     }
 
     #[cfg(feature = "mzsignal")]
-    #[test]
+    #[test_log::test]
     fn test_averaging() -> io::Result<()> {
         use crate::spectrum::group::SpectrumAveragingIterator;