Don't panic on a non-fatal error

rust-lang · Sep 26, 2019 · f7bfd9d · f7bfd9d
1 parent e2010e8
commit f7bfd9d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/cargo/core/resolver/context.rs b/src/cargo/core/resolver/context.rs
@@ -11,7 +11,7 @@ use crate::util::Graph;
 
 use super::dep_cache::RegistryQueryer;
 use super::errors::ActivateResult;
-use super::types::{ConflictMap, FeaturesSet, ResolveOpts};
+use super::types::{ConflictMap, ConflictReason, FeaturesSet, ResolveOpts};
 
 pub use super::encode::Metadata;
 pub use super::encode::{EncodableDependency, EncodablePackageId, EncodableResolve};
@@ -151,7 +151,11 @@ impl Context {
                     if dep.source_id() != id.source_id() {
                         let key = (id.name(), dep.source_id(), id.version().into());
                         let prev = self.activations.insert(key, (summary.clone(), age));
-                        assert!(prev.is_none());
+                        if let Some((previous_summary, _)) = prev {
+                            return Err(
+                                (previous_summary.package_id(), ConflictReason::Semver).into()
+                            );
+                        }
                     }
                 }