Remove some clones from pathfinding

Peter554 · Jan 11, 2025 · 7fcbd00 · 7fcbd00
1 parent 62d22e2
commit 7fcbd00
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/src/imports_info/queries/internal_imports.rs b/src/imports_info/queries/internal_imports.rs
@@ -98,9 +98,9 @@ pub struct InternalImportsPathQuery {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-enum PathfindingNode {
+enum PathfindingNode<'a> {
     Initial,
-    PackageItem(PackageItemToken),
+    PackageItem(&'a PackageItemToken),
 }
 
 impl<'a> InternalImportsQueries<'a> {
@@ -415,15 +415,16 @@ impl<'a> InternalImportsQueries<'a> {
 
         let reachable_items = bfs_reach(PathfindingNode::Initial, |item| {
             let items = match item {
-                PathfindingNode::Initial => items.clone(),
-                PathfindingNode::PackageItem(item) => imports_map.get(item).unwrap().clone(),
+                PathfindingNode::Initial => &items,
+                PathfindingNode::PackageItem(item) => imports_map.get(item).unwrap(),
             };
-            items.into_iter().map(PathfindingNode::PackageItem)
+            items.iter().map(PathfindingNode::PackageItem)
         })
         .filter_map(|item| match item {
             PathfindingNode::Initial => None,
             PathfindingNode::PackageItem(item) => Some(item),
         })
+        .cloned()
         .collect::<HashSet<_>>();
 
         let reachable_items = &reachable_items - &items;
@@ -548,15 +549,12 @@ impl<'a> InternalImportsQueries<'a> {
             &PathfindingNode::Initial,
             |item| {
                 let items = match item {
-                    PathfindingNode::Initial => query.from.clone(),
-                    PathfindingNode::PackageItem(item) => self
-                        .imports_info
-                        .internal_imports
-                        .get(item)
-                        .unwrap()
-                        .clone(),
+                    PathfindingNode::Initial => &query.from,
+                    PathfindingNode::PackageItem(item) => {
+                        self.imports_info.internal_imports.get(item).unwrap()
+                    }
                 };
-                let items = &items - &query.excluding_paths_via;
+                let items = items.difference(&query.excluding_paths_via);
                 items.into_iter().map(PathfindingNode::PackageItem)
             },
             |item| match item {
@@ -572,6 +570,7 @@ impl<'a> InternalImportsQueries<'a> {
                     PathfindingNode::PackageItem(item) => item,
                     PathfindingNode::Initial => panic!(),
                 })
+                .cloned()
                 .collect()
         });