refactor: Use unordered pair implementation from crates.io (#22)

Cargo.toml

@@ -5,6 +5,5 @@ members = [
     "matching",
     "merge",
     "parsing",
-    "model",
-    "utils"
+    "model"
 ]

bin/Cargo.toml

@@ -10,7 +10,6 @@ merge = { path = "../merge" }
 model = { path = "../model" }
 parsing = { path = "../parsing" }
 matching = { path = "../matching" }
-utils = { path = "../utils" }
 assert_cmd = "2.0.12"
 clap = { version = "4.4.8", features = ["derive"] }
 

matching/Cargo.toml

@@ -7,4 +7,4 @@ edition = "2021"
 
 [dependencies]
 model = { path = "../model" }
-utils = { path = "../utils" }
+unordered-pair = "0.2.4"

matching/src/matchings.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use model::CSTNode;
-use utils::unordered_pair::UnorderedPair;
+use unordered_pair::UnorderedPair;
 
 use crate::matching::Matching;
 use crate::matching_entry::MatchingEntry;
@@ -47,7 +47,7 @@ impl<'a> Matchings<'a> {
         left: &'a CSTNode<'a>,
         right: &'a CSTNode<'a>,
     ) -> Option<&MatchingEntry> {
-        self.matching_entries.get(&UnorderedPair::new(left, right))
+        self.matching_entries.get(&UnorderedPair(left, right))
     }
 
     pub fn has_bidirectional_matching(

matching/src/ordered_tree_matching.rs

@@ -1,6 +1,6 @@
 use crate::{calculate_matchings, matching_entry::MatchingEntry, Matchings};
 use model::CSTNode;
-use utils::unordered_pair::UnorderedPair;
+use unordered_pair::UnorderedPair;
 
 #[derive(PartialEq, Eq, Debug, Clone)]
 enum Direction {
@@ -72,7 +72,7 @@ pub fn ordered_tree_matching<'a>(left: &'a CSTNode, right: &'a CSTNode) -> Match
             let mut j = n;
 
             let mut matchings = Matchings::from_single(
-                UnorderedPair::new(left, right),
+                UnorderedPair(left, right),
                 MatchingEntry::new(matrix_m[m][n] + root_matching, left == right),
             );
 
@@ -106,14 +106,11 @@ pub fn ordered_tree_matching<'a>(left: &'a CSTNode, right: &'a CSTNode) -> Match
         ) => {
             let is_perfetch_match = kind_left == kind_right && value_left == value_right;
             Matchings::from_single(
-                UnorderedPair::new(left, right),
+                UnorderedPair(left, right),
                 MatchingEntry::new(is_perfetch_match.into(), is_perfetch_match),
             )
         }
-        (_, _) => Matchings::from_single(
-            UnorderedPair::new(left, right),
-            MatchingEntry::new(0, false),
-        ),
+        (_, _) => Matchings::from_single(UnorderedPair(left, right), MatchingEntry::new(0, false)),
     }
 }
 

matching/src/unordered_tree_matching.rs

@@ -1,5 +1,5 @@
 use model::CSTNode;
-use utils::unordered_pair::UnorderedPair;
+use unordered_pair::UnorderedPair;
 
 use crate::{calculate_matchings, MatchingEntry, Matchings};
 
@@ -19,7 +19,7 @@ pub fn unordered_tree_matching<'a>(left: &'a CSTNode, right: &'a CSTNode) -> cra
         ) => {
             let is_perfetch_match = kind_left == kind_right && value_left == value_right;
             Matchings::from_single(
-                UnorderedPair::new(left, right),
+                UnorderedPair(left, right),
                 MatchingEntry::new(is_perfetch_match.into(), is_perfetch_match),
             )
         }

merge/Cargo.toml

@@ -8,5 +8,4 @@ edition = "2021"
 [dependencies]
 model = { path = "../model" }
 matching = { path = "../matching" }
-utils = { path = "../utils" }
 diffy = "0.3.0"