Only override published resolver when the workspace is different #10961
Conversation
This file contains 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
|
r? @ehuss (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
epage
reviewed
Aug 9, 2022
There was a problem hiding this comment.
Thanks for pulling this out!
The nit is not a blocker. I mostly included it for consideration for future PRs. I had considered having it pulled out to minimize risk as this will be backported to beta but I figured having it instead helped reduce risk as it ensures both code paths are aligned.
Nemo157
force-pushed
the
skip-implicit-override
branch
from
8b650bd
to
8b0a3ff
Compare
Nemo157
force-pushed
the
skip-implicit-override
branch
from
8b0a3ff
to
492358a
Compare
|
@bors r+ |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
|
@ehuss I'm assuming |
|
Yes, rust-1.64.0 is the correct branch, thanks! |
bors
added a commit
that referenced
this pull request
Aug 11, 2022
[BETA 1.64] Only override published resolver when the workspace is different ### What does this PR try to resolve? Ensures when publishing a package that uses an implicit `resolver = "1"` to maintain an MSRV before the `resolver` key 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
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 12, 2022
Update cargo 8 commits in ce40690a5e4e315d3dab0aae1eae69d0252c52ac..efd4ca3dc0b89929dc8c5f5c023d25978d76cb61 2022-08-09 22:32:17 +0000 to 2022-08-12 01:28:28 +0000 - Use `std::thread::scope` to replace crossbeam (rust-lang/cargo#10977) - [docs] Remove extra "in" from `cargo-test.md` (rust-lang/cargo#10978) - Enable two windows tests (rust-lang/cargo#10930) - Improve error msg for get target runner (rust-lang/cargo#10968) - Ensure rustc-echo-wrapper works with an overridden build.target-dir (rust-lang/cargo#10962) - Switch back to `available_parallelism` (rust-lang/cargo#10969) - Only override published resolver when the workspace is different (rust-lang/cargo#10961) - Add `CARGO_LOG` to "Environment variables Cargo reads" (rust-lang/cargo#10967)
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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)