[BETA 1.64] Only override published resolver when the workspace is different#10970
Merged
bors merged 2 commits intorust-lang:rust-1.64.0from Aug 11, 2022
Merged
[BETA 1.64] Only override published resolver when the workspace is different#10970bors merged 2 commits intorust-lang:rust-1.64.0from
bors merged 2 commits intorust-lang:rust-1.64.0from
Conversation
|
r? @ehuss (rust-highfive has picked a reviewer for you, use r? to override) |
|
Contributor
|
Thanks! @bors r+ |
Contributor
Contributor
Contributor
|
☀️ Test successful - checks-actions |
Mark-Simulacrum
added a commit
to Mark-Simulacrum/rust
that referenced
this pull request
Aug 11, 2022
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 14, 2022
…mulacrum Rollup of beta backports This rolls up bumping stage0 to released stable and: * Iterate generics_def_id_map in reverse order to fix P-critical issue rust-lang#100340 * [BETA 1.64] Only override published resolver when the workspace is different rust-lang/cargo#10970 r? `@Mark-Simulacrum`
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
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.
What does this PR try to resolve?
Ensures when publishing a package that uses an implicit
resolver = "1"to maintain an MSRV before theresolverkey was stabilized the implicitness is retained rather than being turned into an explicit setting.fixes #10954 (assuming that the workspace and its packages are configured with a consistent resolver)
Note: this is a backport of #10961 to beta