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

Check for a source defined multiple times. #7751

Merged
merged 1 commit into from
Jan 6, 2020

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Dec 28, 2019

There is a bug where if a source is defined in multiple [source] tables, it causes a key collision in SourceConfigMap::id2name. This can result in random behavior depending on which key is inserted first.

I decided to just make it an error. I can't think of a way to make it work since the replace-with chain walking depends on unique sourceid->name mappings. If anyone has ideas how to support it, I can try, but I don't immediately see how.

Closes #7692

@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 28, 2019
@Eh2406
Copy link
Contributor

Eh2406 commented Dec 28, 2019

Lgtm. Leaving open to give a chance of an anyone to come along.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Jan 6, 2020

📌 Commit 30cc7ce has been approved by alexcrichton

@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 Jan 6, 2020
bors added a commit that referenced this pull request Jan 6, 2020
Check for a source defined multiple times.

There is a bug where if a source is defined in multiple `[source]` tables, it causes a key collision in `SourceConfigMap::id2name`.  This can result in random behavior depending on which key is inserted first.

I decided to just make it an error.  I can't think of a way to make it work since the `replace-with` chain walking depends on unique sourceid->name mappings.  If anyone has ideas how to support it, I can try, but I don't immediately see how.

Closes #7692
@bors
Copy link
Collaborator

bors commented Jan 6, 2020

⌛ Testing commit 30cc7ce with merge 801942b...

@bors
Copy link
Collaborator

bors commented Jan 6, 2020

☀️ Test successful - checks-azure
Approved by: alexcrichton
Pushing 801942b to master...

@bors bors merged commit 30cc7ce into rust-lang:master Jan 6, 2020
bors added a commit to rust-lang/rust that referenced this pull request Jan 7, 2020
Update cargo

9 commits in 86134e7666a088682f20b76278c3ee096a315218..6e1ca924a67dd1ac89c33f294ef26b5c43b89168
2019-12-23 16:08:07 +0000 to 2020-01-06 19:11:37 +0000
- Fix dynamic linking for Windows UWP MSVC targets (rust-lang/cargo#7758)
- Fix CARGO_TARGET_triple_LINKER environment variable. (rust-lang/cargo#7763)
- Remove metadata dep_kinds duplicates. (rust-lang/cargo#7756)
- Check for a source defined multiple times. (rust-lang/cargo#7751)
- Fix typo. (rust-lang/cargo#7735)
- Fix config env vars that are prefix of another with underscore. (rust-lang/cargo#7748)
- Add test for `cargo pkgid` (rust-lang/cargo#7741)
- Add a note to the error message for using --feature / --no-default-features in a virtual workspace (rust-lang/cargo#7742)
- Fix debug message. (rust-lang/cargo#7749)
@ehuss ehuss added this to the 1.42.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.

Cargo build will rebuild without code change
5 participants