From 5285fadd489cd03ebd52c6330c35354fcc7c5d58 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Tue, 10 Oct 2023 21:31:31 -0500
Subject: [PATCH] fix(replace): Error, rather than assert, on version mismatch

---
 src/cargo/core/resolver/dep_cache.rs | 19 ++++++++++++++-----
 tests/testsuite/replace.rs           | 12 ++++++------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/cargo/core/resolver/dep_cache.rs b/src/cargo/core/resolver/dep_cache.rs
index 7b6e0661f170..9041c5b0f9ed 100644
--- a/src/cargo/core/resolver/dep_cache.rs
+++ b/src/cargo/core/resolver/dep_cache.rs
@@ -173,11 +173,20 @@ impl<'a> RegistryQueryer<'a> {
                 )));
             }
 
-            // The dependency should be hard-coded to have the same name and an
-            // exact version requirement, so both of these assertions should
-            // never fail.
-            assert_eq!(s.version(), summary.version());
-            assert_eq!(s.name(), summary.name());
+            assert_eq!(
+                s.name(),
+                summary.name(),
+                "dependency should be hard coded to have the same name"
+            );
+            if s.version() != summary.version() {
+                return Poll::Ready(Err(anyhow::anyhow!(
+                    "replacement specification `{}` matched {} and tried to override it with {}\n\
+                     avoid matching unrelated packages by being more specific",
+                    spec,
+                    summary.version(),
+                    s.version(),
+                )));
+            }
 
             let replace = if s.source_id() == summary.source_id() {
                 debug!("Preventing\n{:?}\nfrom replacing\n{:?}", summary, s);
diff --git a/tests/testsuite/replace.rs b/tests/testsuite/replace.rs
index ee2314fd7972..a0bce4e24896 100644
--- a/tests/testsuite/replace.rs
+++ b/tests/testsuite/replace.rs
@@ -1300,7 +1300,7 @@ fn override_plus_dep() {
 }
 
 #[cargo_test]
-fn override_different_metadata() {
+fn override_generic_matching_other_versions() {
     Package::new("bar", "0.1.0+a").publish();
 
     let bar = git::repo(&paths::root().join("override"))
@@ -1338,11 +1338,11 @@ fn override_different_metadata() {
             "\
 [UPDATING] `dummy-registry` index
 [UPDATING] git repository `[..]`
-thread 'main' panicked at src/cargo/core/resolver/dep_cache.rs:179:13:
-assertion `left == right` failed
-  left: Version { major: 0, minor: 1, patch: 0 }
- right: Version { major: 0, minor: 1, patch: 0, build: BuildMetadata(\"a\") }
-note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
+[ERROR] failed to get `bar` as a dependency of package `foo v0.0.1 ([..]/foo)`
+
+Caused by:
+  replacement specification `https://github.com/rust-lang/crates.io-index#bar@0.1.0` matched 0.1.0+a and tried to override it with 0.1.0
+  avoid matching unrelated packages by being more specific
 ",
         )
         .with_status(101)