Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/base-db/src/input.rs')
| -rw-r--r-- | crates/base-db/src/input.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crates/base-db/src/input.rs b/crates/base-db/src/input.rs index e86944eeb3..fe5d4091e5 100644 --- a/crates/base-db/src/input.rs +++ b/crates/base-db/src/input.rs @@ -505,6 +505,7 @@ impl CrateGraph { mut other: CrateGraph, proc_macros: &mut ProcMacroPaths, ) -> FxHashMap<CrateId, CrateId> { + self.sort_deps(); let topo = other.crates_in_topological_order(); let mut id_map: FxHashMap<CrateId, CrateId> = FxHashMap::default(); for topo in topo { @@ -513,7 +514,9 @@ impl CrateGraph { crate_data.dependencies.iter_mut().for_each(|dep| dep.crate_id = id_map[&dep.crate_id]); crate_data.dependencies.sort_by_key(|dep| dep.crate_id); - let new_id = self.arena.alloc(crate_data.clone()); + let find = self.arena.iter().find(|(_, v)| *v == crate_data); + let new_id = + if let Some((k, _)) = find { k } else { self.arena.alloc(crate_data.clone()) }; id_map.insert(topo, new_id); } |