Skip to content

[beta] Fix issue with filtering exclusive target dependencies.#9257

Merged
bors merged 1 commit intorust-lang:rust-1.51.0from
ehuss:beta-fix-deps-filtering
Mar 12, 2021
Merged

[beta] Fix issue with filtering exclusive target dependencies.#9257
bors merged 1 commit intorust-lang:rust-1.51.0from
ehuss:beta-fix-deps-filtering

Conversation

@ehuss
Copy link
Contributor

@ehuss ehuss commented Mar 12, 2021

Beta backport of #9255.

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
@rust-highfive
Copy link

r? @Eh2406

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.51.0. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 12, 2021
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 12, 2021

📌 Commit 235d958 has been approved by alexcrichton

@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 12, 2021
@bors
Copy link
Contributor

bors commented Mar 12, 2021

⌛ Testing commit 235d958 with merge 35a2a43...

@bors
Copy link
Contributor

bors commented Mar 12, 2021

☀️ Test successful - checks-actions
Approved by: alexcrichton
Pushing 35a2a43 to rust-1.51.0...

@bors bors merged commit 35a2a43 into rust-lang:rust-1.51.0 Mar 12, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 12, 2021
[beta] Update cargo

2 commits in 9294589828ca283c690625a7fade9d264e64606d..35a2a434d37e796e2f013f577b3c481f518afd97
2021-02-22 22:05:24 +0000 to 2021-03-12 01:08:31 +0000
- [beta] Fix issue with filtering exclusive target dependencies. (rust-lang/cargo#9257)
- Update split-debuginfo docs around the default. (rust-lang/cargo#9224)
@ehuss ehuss added this to the 1.51.0 milestone 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.

5 participants