Fix unit_for computation on proc-macros in shared workspace.#9059
Merged
bors merged 1 commit intorust-lang:masterfrom Jan 11, 2021
Merged
Fix unit_for computation on proc-macros in shared workspace.#9059bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
|
r? @Eh2406 (rust-highfive has picked a reviewer for you, use r? to override) |
4 tasks
Contributor
|
The explanation makes sense, the code passes tests, and the code looks good. But I will let Alex look it over as I do not have a good understanding of the context. |
Member
|
@bors: r+ |
Contributor
|
📌 Commit a846898 has been approved by |
Contributor
Contributor
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 15, 2021
Update cargo 10 commits in 329895f5b52a358e5d9ecb26215708b5cb31d906..a73e5b7d567c3036b296fc6b33ed52c5edcd882e 2021-01-06 00:01:52 +0000 to 2021-01-12 23:45:39 +0000 - Sort available binaries when multiple (rust-lang/cargo#9066) - Fix misspelling of environment variable (rust-lang/cargo#9067) - Remove statement that opt-level 0 turns on debug (rust-lang/cargo#9070) - Fix `links` vars showing up for testing packages (rust-lang/cargo#9065) - Fix unit_for computation on proc-macros in shared workspace. (rust-lang/cargo#9059) - Document `could not find the github team` error on `cargo owner --add` (rust-lang/cargo#9000) - Unstable section of cargo/config.toml takes bools (rust-lang/cargo#9057) - [doc] add note about empty environment variables for missing manifest keys (rust-lang/cargo#9053) - another round of clippy lint fixes (rust-lang/cargo#9051) - Updated display message of cargo metadata --help (rust-lang/cargo#9050)
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.
There was a bug where the UnitFor was not being computed properly for proc-macros in a workspace with shared dependencies, integration tests, and a mixture of various flags (
--workspace --all-targets --all-features). The issue is that this line, which is used when attaching the implicit dependency from an integration test to its library, was using the wrong unit_for value (it was not checking if the implicit lib is a proc-macro). The consequence is that the graph could be built inconsistently, causing features to be randomly selected incorrectly if the integration test happened to be the first unit processed.The solution here is to use a common function for transitioning the unit_for value. The with_for_host/with_host_features split was mostly a consequence of how things evolved over time, and keeping them separate wasn't really necessary.