refactor: write more idiomatic code

jpedroh · Jul 27, 2024 · 68a04ec · 68a04ec
1 parent a63cbd9
commit 68a04ec
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/matching/src/matchings.rs b/matching/src/matchings.rs
@@ -52,10 +52,15 @@ impl<'a> Matchings<'a> {
         &'a self,
         a_node: &'a CSTNode<'a>,
         children: &'a [CSTNode<'a>],
-    ) -> Option<&'a MatchingEntry> {
-        children
-            .iter()
-            .find_map(|left_child| self.get_matching_entry(left_child, a_node))
+    ) -> Option<Matching> {
+        children.iter().find_map(|child| {
+            let matching_entry = self.get_matching_entry(child, a_node)?;
+            Some(Matching {
+                matching_node: child,
+                score: matching_entry.score,
+                is_perfect_match: matching_entry.is_perfect_match,
+            })
+        })
     }
 
     pub fn get_matching_entry(

diff --git a/merge/src/unordered_merge.rs b/merge/src/unordered_merge.rs
@@ -39,7 +39,8 @@ pub fn unordered_merge<'a>(
         }
 
         let matching_base_left = base_left_matchings.find_matching_for(left_child);
-        let matching_left_right = left_right_matchings.find_matching_for(left_child);
+        let matching_left_right =
+            left_right_matchings.find_matching_node_in_children(left_child, right.get_children());
 
         match (matching_base_left, matching_left_right) {
             // Added only by left
@@ -91,7 +92,8 @@ pub fn unordered_merge<'a>(
         .filter(|node| !processed_nodes.contains(&node.id()))
     {
         let matching_base_right = base_right_matchings.find_matching_for(right_child);
-        let matching_left_right = left_right_matchings.find_matching_for(right_child);
+        let matching_left_right =
+            left_right_matchings.find_matching_node_in_children(right_child, left.get_children());
 
         match (matching_base_right, matching_left_right) {
             // Added only by right