Skip to content

Make negative coherence work when there's impl negative on super predicates - #95039

Merged
bors merged 8 commits into
rust-lang:masterfrom
spastorino:overlap-super-predicates
Mar 18, 2022
Merged

Make negative coherence work when there's impl negative on super predicates#95039
bors merged 8 commits into
rust-lang:masterfrom
spastorino:overlap-super-predicates

Conversation

@spastorino

@spastorinospastorino commented Mar 17, 2022

Copy link
Copy Markdown
Member

@rustbotrustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 17, 2022
@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 17, 2022
jackh726
jackh726 approved these changes Mar 17, 2022
View reviewed changes

@jackh726jackh726 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One nit and one question, then r=me

Comment threadcompiler/rustc_trait_selection/src/traits/coherence.rs Outdated
Comment threadcompiler/rustc_trait_selection/src/traits/coherence.rs Outdated
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@spastorino
spastorinoforce-pushed the overlap-super-predicates branch from 3dbe419 to 9c076f3CompareMarch 17, 2022 17:38
nikomatsakis
nikomatsakis requested changes Mar 17, 2022
View reviewed changes

@nikomatsakisnikomatsakis left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me with FIXME removed

Comment threadcompiler/rustc_trait_selection/src/traits/coherence.rs Outdated
Comment threadcompiler/rustc_trait_selection/src/traits/coherence.rs Outdated
@nikomatsakis

nikomatsakis commented Mar 17, 2022

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Mar 17, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 89a00cc has been approved by nikomatsakis

@bors

bors commented Mar 17, 2022

Copy link
Copy Markdown
Collaborator

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@borsbors 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 17, 2022
pierwill
pierwill reviewed Mar 17, 2022
View reviewed changes
Comment threadcompiler/rustc_trait_selection/src/traits/coherence.rs
pierwill
pierwill reviewed Mar 17, 2022
View reviewed changes
Comment threadcompiler/rustc_trait_selection/src/traits/coherence.rs
@matthiaskrgrmatthiaskrgr mentioned this pull request Mar 18, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 18, 2022
@bors
Auto merge ofrust-lang#95065- matthiaskrgr:rollup-75i6oz5, r=matthi…
691d1c1
…askrgr
Rollup of 4 pull requests
Successful merges:
- rust-lang#95013 (Update browser-ui-test version to 0.8.2)
- rust-lang#95039 (Make negative coherence work when there's impl negative on super predicates)
- rust-lang#95047 (Refactor: remove an unnecessary pattern for ignoring all parts)
- rust-lang#95048 (update Miri)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 588d389 into rust-lang:masterMar 18, 2022
@rustbotrustbot added this to the 1.61.0 milestone Mar 18, 2022
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nikomatsakisnikomatsakisnikomatsakis requested changes
@jackh726jackh726jackh726 approved these changes
+1 more reviewer
@pierwillpierwillpierwill left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@nikomatsakisnikomatsakis

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.61.0

Development

Successfully merging this pull request may close these issues.

8 participants

@spastorino@rust-log-analyzer@nikomatsakis@bors@pierwill@jackh726@rust-highfive@rustbot