Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reject ambiguous git dependency declaration. #8984

Merged
merged 1 commit into from Dec 16, 2020

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Dec 16, 2020

This rejects a git dependency that specifies more than one of branch, tag, or rev. Cargo does not handle this case very well, and this warning has been in place for 4 years (since #2940).

Fixes #7841

@rust-highfive
Copy link

r? @Eh2406

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 16, 2020
@Eh2406
Copy link
Contributor

Eh2406 commented Dec 16, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented Dec 16, 2020

📌 Commit d65a714 has been approved by Eh2406

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 16, 2020
@bors
Copy link
Collaborator

bors commented Dec 16, 2020

⌛ Testing commit d65a714 with merge fde8ee3...

@bors
Copy link
Collaborator

bors commented Dec 16, 2020

☀️ Test successful - checks-actions
Approved by: Eh2406
Pushing fde8ee3 to master...

@bors bors merged commit fde8ee3 into rust-lang:master Dec 16, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 24, 2020
Update cargo

10 commits in a3c2627fbc2f5391c65ba45ab53b81bf71fa323c..75d5d8cffe3464631f82dcd3c470b78dc1dda8bb
2020-12-14 17:21:26 +0000 to 2020-12-22 18:10:56 +0000
- Update git2 (rust-lang/cargo#9009)
- Stabilize RUSTC_WORKSPACE_WRAPPER (rust-lang/cargo#8976)
- Make cargo metadata and tree respect target (rust-lang/cargo#8987)
- Update git2 (rust-lang/cargo#8998)
- Revert rust-lang/cargo#8954 - changing rustdoc's cwd (rust-lang/cargo#8996)
- With debug HTTP mode log curl's version (rust-lang/cargo#8991)
- Reject ambiguous git dependency declaration. (rust-lang/cargo#8984)
- Fix tests not working with a different CARGO_TARGET_DIR. (rust-lang/cargo#8982)
- Add version to credential dependencies. (rust-lang/cargo#8983)
- Clarify FAQ entry wording about lockfiles (rust-lang/cargo#8978)
@matklad
Copy link
Member

matklad commented Jun 14, 2021

Apparently, 4 years of warnings isn’t enough to ensure that people don’t hit this in practice. Someone tried building Firefox 78 (June 2020) with Rust 1.52.1 and hit this error. It might be helpful to check why the warning wasn’t noticed in that context.

https://utcc.utoronto.ca/~cks/space/blog/programming/Rust1BackwardIncompatibility (See the comment section for the actually helpful information).

@ehuss ehuss added this to the 1.50.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Inconsistent data in cargo metadata
5 participants