Fix build failure

snijderlab · Sep 11, 2024 · 4cdf624 · 4cdf624
1 parent 5ed6b1a
commit 4cdf624
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/examples/multi-annotator/src/main.rs b/examples/multi-annotator/src/main.rs
@@ -98,8 +98,8 @@ fn main() {
                     if args.charge_independent_Y {
                         let unique_Y = fragments
                             .iter()
-                            .filter_map(|frag| {
-                                if let FragmentType::Y(pos) = &frag.ion {
+                            .filter_map(|fragment| {
+                                if let FragmentType::Y(pos) = &fragment.ion {
                                     Some(pos)
                                 } else {
                                     None
@@ -110,8 +110,8 @@ fn main() {
                         let unique_Y_found = annotated
                             .spectrum()
                             .flat_map(|peak| &peak.annotation)
-                            .filter_map(|(frag, _)| {
-                                if let FragmentType::Y(pos) = &frag.ion {
+                            .filter_map(|fragment| {
+                                if let FragmentType::Y(pos) = &fragment.ion {
                                     Some(pos)
                                 } else {
                                     None

diff --git a/rustyms-py/src/lib.rs b/rustyms-py/src/lib.rs
@@ -1312,7 +1312,7 @@ impl AnnotatedPeak {
         self.0
             .annotation
             .iter()
-            .map(|x| Fragment(x.0.clone()))
+            .map(|x| Fragment(x.clone()))
             .collect()
     }
 }

diff --git a/rustyms/src/spectrum/fragmentation.rs b/rustyms/src/spectrum/fragmentation.rs
@@ -41,9 +41,7 @@ pub trait AnnotatableSpectrum {
 
             // Get the index of the element closest to this value
             if let Some(index) = Self::search(self, mz, tolerance) {
-                annotated.spectrum[index]
-                    .annotation
-                    .push((fragment.clone(), Vec::new()));
+                annotated.spectrum[index].annotation.push(fragment.clone());
             }
         }
 

diff --git a/rustyms/src/spectrum/scores.rs b/rustyms/src/spectrum/scores.rs
@@ -103,7 +103,7 @@ impl AnnotatedSpectrum {
                 let number = p
                     .annotation
                     .iter()
-                    .filter(|(a, _)| {
+                    .filter(|a| {
                         peptidoform_index.map_or(true, |i| a.peptidoform_index == i)
                             && peptide_index.map_or(true, |i| a.peptide_index == i)
                             && ion.map_or(true, |kind| a.ion.kind() == kind)
@@ -147,12 +147,12 @@ impl AnnotatedSpectrum {
                 .flat_map(|p| {
                     p.annotation
                         .iter()
-                        .filter(|(a, _)| {
+                        .filter(|a| {
                             a.peptidoform_index == peptidoform_index
                                 && a.peptide_index == peptide_index
                                 && ion.map_or(true, |kind| a.ion.kind() == kind)
                         })
-                        .filter_map(|(a, _)| a.ion.position())
+                        .filter_map(|a| a.ion.position())
                 })
                 .map(|pos| pos.sequence_index)
                 .unique()
@@ -181,12 +181,12 @@ impl AnnotatedSpectrum {
             .spectrum
             .iter()
             .flat_map(|p| {
-                p.annotation.iter().filter(|(a, _)| {
+                p.annotation.iter().filter(|a| {
                     peptide_index.map_or(true, |i| a.peptide_index == i)
                         && ion.map_or(true, |kind| a.ion.kind() == kind)
                 })
             })
-            .map(|(f, _)| f.formula.clone())
+            .map(|f| f.formula.clone())
             .unique()
             .count() as u32;
         let total_fragments = fragments