[beta] 1.51 backports #9277
Merged
[beta] 1.51 backports #9277
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…excrichton Fix doc duplicate removal of root units. The doc collision removal code didn't consider the possibility that there was a collision with a root unit. This caused problems in conjunction with rust-lang#9142 where cargo would panic because a root unit got removed from the graph because of a filename collision. The solution here is to avoid removing root units during the doc collision sweep. This has a downside that this reintroduces a filename collision. An alternate solution would be to make the set of root units mutable, and remove from that list, but I figured this is simpler and more conservative. Fixes rust-lang#9274
Fix --feature pkg/feat for V1 resolver for non-member. rust-lang#8997 had an unintended regression where `-p foo --feature foo/feat` syntax where `foo` is an **optional non-member** fails with an error that `foo` did not match any packages. The issue is that the member/feature selection routine needed to slot this into the features for the package in the current working directory (it was incorrectly treating `foo` as a workspace member). V2 outright does not allow specifying features for non-workspace members. Fixes rust-lang#9265
|
r? @Eh2406 (rust-highfive has picked a reviewer for you, use r? to override) |
|
rust-highfive
added
the
S-waiting-on-review
Member
|
@bors: r+ |
Contributor
|
📌 Commit 77a13c0 has been approved by |
bors
added
S-waiting-on-bors
Contributor
Contributor
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 17, 2021
[beta] Update cargo 1 commits in 35a2a434d37e796e2f013f577b3c481f518afd97..43b129a20fbf1ede0df411396ccf0c024bf34134 2021-03-12 01:08:31 +0000 to 2021-03-16 22:05:51 +0000 - [beta] 1.51 backports (rust-lang/cargo#9277)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backports of: