Fix: port #5 to all other reader types

mobiusklein · Aug 23, 2024 · 5eabab9 · 5eabab9
1 parent fe4b6ad
commit 5eabab9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/io/mzml/async.rs b/src/io/mzml/async.rs
@@ -741,8 +741,7 @@ impl<
 
     /// Retrieve a spectrum by it's native ID
     pub async fn get_spectrum_by_id(&mut self, id: &str) -> Option<MultiLayerSpectrum<C, D>> {
-        let offset_ref = self.index.get(id);
-        let offset = offset_ref.expect("Failed to retrieve offset");
+        let offset = self.index.get(id)?;
         let start = self
             .handle
             .stream_position()

diff --git a/src/io/mzml/reader.rs b/src/io/mzml/reader.rs
@@ -1553,8 +1553,7 @@ impl<
 {
     /// Retrieve a spectrum by it's native ID
     fn get_spectrum_by_id(&mut self, id: &str) -> Option<MultiLayerSpectrum<C, D>> {
-        let offset_ref = self.spectrum_index.get(id);
-        let offset = offset_ref.expect("Failed to retrieve offset");
+        let offset = self.spectrum_index.get(id)?;
         let start = self
             .handle
             .stream_position()

diff --git a/src/io/mzmlb/reader.rs b/src/io/mzmlb/reader.rs
@@ -1082,8 +1082,7 @@ impl<
 {
     /// Retrieve a spectrum by it's native ID
     fn get_spectrum_by_id(&mut self, id: &str) -> Option<MultiLayerSpectrum<C, D>> {
-        let offset_ref = self.spectrum_index.get(id);
-        let offset = offset_ref.expect("Failed to retrieve offset");
+        let offset = self.spectrum_index.get(id)?;
         let start = self
             .mzml_parser
             .stream_position()