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

Fix issue with filtering exclusive target dependencies. #9255

Merged
merged 1 commit into from
Mar 11, 2021

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Mar 11, 2021

#8777 incorrectly changed the filtering logic for dependencies. Essentially it split filter(any(A && B && C && D)) into two parts filter(any(A && B)).filter(any(C && D)) which doesn't have the same meaning. The solution here is to pass a closure so that the conditions are joined again.

Fixes #9216

@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 Mar 11, 2021
@Eh2406
Copy link
Contributor

Eh2406 commented Mar 11, 2021

@bors r+

Should we back port?

@bors
Copy link
Collaborator

bors commented Mar 11, 2021

📌 Commit 8ce2a1b has been approved by Eh2406

@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 Mar 11, 2021
@bors
Copy link
Collaborator

bors commented Mar 11, 2021

⌛ Testing commit 8ce2a1b with merge c4adfd5...

@bors
Copy link
Collaborator

bors commented Mar 11, 2021

☀️ Test successful - checks-actions
Approved by: Eh2406
Pushing c4adfd5 to master...

@bors bors merged commit c4adfd5 into rust-lang:master Mar 11, 2021
ehuss pushed a commit to ehuss/cargo that referenced this pull request Mar 12, 2021
Fix issue with filtering exclusive target dependencies.

rust-lang#8777 incorrectly changed the filtering logic for dependencies.  Essentially it split `filter(any(A && B && C && D))` into two parts `filter(any(A && B)).filter(any(C && D))` which doesn't have the same meaning. The solution here is to pass a closure so that the conditions are joined again.

Fixes rust-lang#9216
@ehuss
Copy link
Contributor Author

ehuss commented Mar 12, 2021

Should we back port?

Sure, posted #9255.

bors added a commit that referenced this pull request Mar 12, 2021
[beta] Fix issue with filtering exclusive target dependencies.

Beta backport of #9255.
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Mar 13, 2021
Update cargo

7 commits in 970bc67c3775781b9708c8a36893576b9459c64a..32da9eaa5de5be241cf8096ca6b749a157194f77
2021-03-07 18:09:40 +0000 to 2021-03-13 01:18:40 +0000
- Fix logic for determining prefer-dynamic for a dylib. (rust-lang/cargo#9252)
- Fix issue with filtering exclusive target dependencies. (rust-lang/cargo#9255)
- Update pkgid-spec docs. (rust-lang/cargo#9249)
- Wordsmith the edition documentation a bit more (rust-lang/cargo#9233)
- Package ID specification urls must contain a host (rust-lang/cargo#9188)
- Add documentation for JSON message_path. (rust-lang/cargo#9247)
- Fix filter_platform to run on targets other than x86. (rust-lang/cargo#9246)
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Mar 14, 2021
Update cargo

7 commits in 970bc67c3775781b9708c8a36893576b9459c64a..32da9eaa5de5be241cf8096ca6b749a157194f77
2021-03-07 18:09:40 +0000 to 2021-03-13 01:18:40 +0000
- Fix logic for determining prefer-dynamic for a dylib. (rust-lang/cargo#9252)
- Fix issue with filtering exclusive target dependencies. (rust-lang/cargo#9255)
- Update pkgid-spec docs. (rust-lang/cargo#9249)
- Wordsmith the edition documentation a bit more (rust-lang/cargo#9233)
- Package ID specification urls must contain a host (rust-lang/cargo#9188)
- Add documentation for JSON message_path. (rust-lang/cargo#9247)
- Fix filter_platform to run on targets other than x86. (rust-lang/cargo#9246)
@ehuss ehuss modified the milestones: 1.52.0, 1.51.0 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.

Weird behavior with target.cfg.dependencies/build-dependencies
4 participants