Add an explanation of links related conflicts to error messages

diff --git a/src/cargo/core/resolver/mod.rs b/src/cargo/core/resolver/mod.rs
index 423e99b83a713b318ba40cddd80621d0cf8da062..9f7068dbc3369afc858cc8014be49186d625496d 100644 (file)
--- a/src/cargo/core/resolver/mod.rs
+++ b/src/cargo/core/resolver/mod.rs
@@ -532,6 +532,12 @@ impl Ord for DepsFrame {
     }
 }
 
+#[derive(Clone, PartialOrd, Ord, PartialEq, Eq)]
+enum ConflictReason {
+    Semver,
+    Links(String),
+}
+
 struct BacktrackFrame<'a> {
     cur: usize,
     context_backup: Context<'a>,
@@ -540,18 +546,18 @@ struct BacktrackFrame<'a> {
     parent: Summary,
     dep: Dependency,
     features: Rc<Vec<String>>,
-    conflicting_activations: HashSet<PackageId>,
+    conflicting_activations: HashMap<PackageId, ConflictReason>,
 }
 
 #[derive(Clone)]
 struct RemainingCandidates {
     remaining: RcVecIter<Candidate>,
     // note: change to RcList or something if clone is to expensive
-    conflicting_prev_active: HashSet<PackageId>,
+    conflicting_prev_active: HashMap<PackageId, ConflictReason>,
 }
 
 impl RemainingCandidates {
-    fn next(&mut self, prev_active: &[Summary], links: &HashMap<String, PackageId>) -> Result<Candidate, HashSet<PackageId>> {
+    fn next(&mut self, prev_active: &[Summary], links: &HashMap<String, PackageId>) -> Result<Candidate, HashMap<PackageId, ConflictReason>> {
         // Filter the set of candidates based on the previously activated
         // versions for this dependency. We can actually use a version if it
         // precisely matches an activated version or if it is otherwise
@@ -565,15 +571,17 @@ impl RemainingCandidates {
         // that conflicted with the ones we tried. If any of these change
         // then we would have considered different candidates.
         for (_, b) in self.remaining.by_ref() {
-            if let Some(a) = b.summary.links().and_then(|l| links.get(l)) {
-                if a != b.summary.package_id() {
-                    self.conflicting_prev_active.insert(a.clone());
-                    continue
+            if let Some(link) = b.summary.links() {
+                if let Some(a) = links.get(link) {
+                    if a != b.summary.package_id() {
+                        self.conflicting_prev_active.insert(a.clone(), ConflictReason::Links(link.to_owned()));
+                        continue
+                    }
                 }
             }
             if let Some(a) = prev_active.iter().find(|a| compatible(a.version(), b.summary.version())) {
                 if *a != b.summary {
-                    self.conflicting_prev_active.insert(a.package_id().clone());
+                    self.conflicting_prev_active.insert(a.package_id().clone(), ConflictReason::Semver);
                     continue
                 }
             }
@@ -673,9 +681,9 @@ fn activate_deps_loop<'a>(mut cx: Context<'a>,
                    dep.name(), prev_active.len());
             let mut candidates = RemainingCandidates {
                 remaining: RcVecIter::new(Rc::clone(&candidates)),
-                conflicting_prev_active: HashSet::new(),
+                conflicting_prev_active: HashMap::new(),
             };
-            conflicting_activations = HashSet::new();
+            conflicting_activations = HashMap::new();
             (candidates.next(prev_active, &cx.links),
              candidates.clone().next(prev_active, &cx.links).is_ok(),
              candidates)
@@ -772,7 +780,7 @@ fn find_candidate<'a>(
     cur: &mut usize,
     dep: &mut Dependency,
     features: &mut Rc<Vec<String>>,
-    conflicting_activations: &mut HashSet<PackageId>,
+    conflicting_activations: &mut HashMap<PackageId, ConflictReason>,
 ) -> Option<Candidate> {
     while let Some(mut frame) = backtrack_stack.pop() {
         let (next, has_another) = {
@@ -786,7 +794,7 @@ fn find_candidate<'a>(
            && conflicting_activations
            .iter()
            // note: a lot of redundant work in is_active for similar debs
-           .all(|con| frame.context_backup.is_active(con))
+           .all(|(con, _)| frame.context_backup.is_active(con))
         {
             continue;
         }
@@ -818,7 +826,7 @@ fn activation_error(cx: &Context,
                     registry: &mut Registry,
                     parent: &Summary,
                     dep: &Dependency,
-                    conflicting_activations: HashSet<PackageId>,
+                    conflicting_activations: HashMap<PackageId, ConflictReason>,
                     candidates: &[Candidate],
                     config: Option<&Config>) -> CargoError {
     let graph = cx.graph();
@@ -842,9 +850,17 @@ fn activation_error(cx: &Context,
         msg.push_str(&describe_path(parent.package_id()));
         let mut conflicting_activations: Vec<_> = conflicting_activations.iter().collect();
         conflicting_activations.sort_unstable();
-        for v in conflicting_activations.iter().rev() {
+        for &(p, r) in conflicting_activations.iter().rev() {
+            match r {
+                &ConflictReason::Links(ref link) => {
+                    msg.push_str("\n  multiple packages link to native library `");
+                    msg.push_str(link);
+                    msg.push_str("`, but a native library can be linked only once.")
+                },
+                _ => (),
+            }
             msg.push_str("\n  previously selected ");
-            msg.push_str(&describe_path(v));
+            msg.push_str(&describe_path(p));
         }
 
         msg.push_str("\n  possible versions to select: ");

diff --git a/tests/build-script.rs b/tests/build-script.rs
index 936e2e2c9bc6413ca378f0c18370df1a05f0f6e6..41ffb7eeb7ff97bc104c50f044bc517b0f5d2787 100644 (file)
--- a/tests/build-script.rs
+++ b/tests/build-script.rs
@@ -257,8 +257,11 @@ fn links_duplicates() {
     assert_that(p.cargo("build"),
                 execs().with_status(101)
                        .with_stderr("\
-error: failed to select a version for `a-sys` (required by `foo`):
-all possible versions conflict with previously selected versions of `a-sys`
+error: failed to select a version for `a-sys`.
+all possible versions conflict with previously selected packages.
+required by package `foo v0.5.0 ([..])`
+  multiple packages link to native library `a`, but a native library can be linked only once.
+  previously selected package `foo v0.5.0 ([..])`
   possible versions to select: 0.5.0
 "));
 }
@@ -307,8 +310,12 @@ fn links_duplicates_deep_dependency() {
     assert_that(p.cargo("build"),
                 execs().with_status(101)
                        .with_stderr("\
-error: failed to select a version for `a-sys` (required by `a`):
-all possible versions conflict with previously selected versions of `a-sys`
+error: failed to select a version for `a-sys`.
+all possible versions conflict with previously selected packages.
+required by package `a v0.5.0 ([..])`
+    ... which is depended on by `foo v0.5.0 ([..])`
+  multiple packages link to native library `a`, but a native library can be linked only once.
+  previously selected package `foo v0.5.0 ([..])`
   possible versions to select: 0.5.0
 "));
 }
@@ -2773,8 +2780,11 @@ fn links_duplicates_with_cycle() {
     assert_that(p.cargo("build"),
                 execs().with_status(101)
                        .with_stderr("\
-error: failed to select a version for `a` (required by `foo`):
-all possible versions conflict with previously selected versions of `a`
+error: failed to select a version for `a`.
+all possible versions conflict with previously selected packages.
+required by package `foo v0.5.0 ([..])`
+  multiple packages link to native library `a`, but a native library can be linked only once.
+  previously selected package `foo v0.5.0 ([..])`
   possible versions to select: 0.5.0
 "));
 }