Skip to content

Commit

Permalink
fix(replace): Error, rather than assert, on version mismatch
Browse files Browse the repository at this point in the history
  • Loading branch information
epage committed Oct 17, 2023
1 parent d318ed4 commit 7502318
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 11 deletions.
19 changes: 14 additions & 5 deletions src/cargo/core/resolver/dep_cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
12 changes: 6 additions & 6 deletions tests/testsuite/replace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 7502318

Please sign in to comment.