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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 8 commits into from
Mar 18, 2022
Merged

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

merged 8 commits into from
Mar 18, 2022

Conversation

spastorino
Copy link
Member

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 17, 2022
@rust-highfive rust-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
Copy link
Member

@jackh726 jackh726 left a comment

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

compiler/rustc_trait_selection/src/traits/coherence.rs Outdated Show resolved Hide resolved
compiler/rustc_trait_selection/src/traits/coherence.rs Outdated Show resolved Hide resolved
@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 spastorino force-pushed the overlap-super-predicates branch from 3dbe419 to 9c076f3 Compare March 17, 2022 17:38
nikomatsakis
nikomatsakis requested changes Mar 17, 2022
View reviewed changes
Copy link
Contributor

@nikomatsakis nikomatsakis left a comment

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

compiler/rustc_trait_selection/src/traits/coherence.rs Outdated Show resolved Hide resolved
compiler/rustc_trait_selection/src/traits/coherence.rs Outdated Show resolved Hide resolved
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Mar 17, 2022

📌 Commit 89a00cc has been approved by nikomatsakis

@bors
Copy link
Contributor

bors commented Mar 17, 2022

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

@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 17, 2022
@matthiaskrgr matthiaskrgr 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 of rust-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:master Mar 18, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pierwill pierwill pierwill left review comments

@nikomatsakis nikomatsakis nikomatsakis requested changes

@jackh726 jackh726 jackh726 approved these changes

Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant 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