Rename merge_dependency into merge_dependants

src/internal/core.rs

@@ -246,7 +246,7 @@ impl<P: Package, VS: VersionSet, Priority: Ord + Clone> State<P, VS, Priority> {
                 .or_default();
             if let Some((past, mergeed)) = deps_lookup.as_mut_slice().iter_mut().find_map(|past| {
                 self.incompatibility_store[id]
-                    .merge_dependency(&self.incompatibility_store[*past])
+                    .merge_dependants(&self.incompatibility_store[*past])
                     .map(|m| (past, m))
             }) {
                 let new = self.incompatibility_store.alloc(mergeed);

src/internal/incompatibility.rs

@@ -138,7 +138,7 @@ impl<P: Package, VS: VersionSet> Incompatibility<P, VS> {
     ///
     /// It is a special case of prior cause computation where the unified package
     /// is the common dependant in the two incompatibilities expressing dependencies.
-    pub fn merge_dependency(&self, other: &Self) -> Option<Self> {
+    pub fn merge_dependants(&self, other: &Self) -> Option<Self> {
         // It is almost certainly a bug to call this method without checking that self is a dependency
         debug_assert!(self.as_dependency().is_some());
         // Check that both incompatibilities are of the shape p1 depends on p2,