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

Register outlives predicates from queries the right way around. #51096

Merged
merged 1 commit into from
Jun 1, 2018

Conversation

matthewjasper
Copy link
Contributor

Closes #49354
The region constraints from queries need to be reversed from sub to outlives.

Note: wf checking reports these errors before NLL, so I'm not sure if there's any case when these predicates need to be created at all.

cc @nikomatsakis

@rust-highfive
Copy link
Collaborator

r? @cramertj

(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 May 26, 2018
@cramertj
Copy link
Member

r? @nikomatsakis

Constraint::VarSubVar(v1, v2) => ty::OutlivesPredicate(
tcx.mk_region(ty::ReVar(v1)).into(),
tcx.mk_region(ty::ReVar(v2)),
tcx.mk_region(ty::ReVar(v2)).into(),
Copy link
Contributor

Choose a reason for hiding this comment

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

woah, this is .. indeed wrong. Sigh.

Copy link
Contributor

Choose a reason for hiding this comment

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

Good catch!

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented May 30, 2018

📌 Commit 9582507 has been approved by nikomatsakis

@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 May 30, 2018
@bors
Copy link
Contributor

bors commented May 30, 2018

🔒 Merge conflict

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 30, 2018
@nikomatsakis
Copy link
Contributor

@bors delegate=matthewjasper

@matthewjasper, when you get a chance to rebase, feel free to tell bors "r=nikomatsakis"

@bors
Copy link
Contributor

bors commented May 31, 2018

✌️ @matthewjasper can now approve this pull request

@matthewjasper matthewjasper force-pushed the reverse-normalization-bounds branch from 9582507 to b83daea Compare May 31, 2018 19:42
@matthewjasper
Copy link
Contributor Author

rebased
@bor r=@nikomatsakis

@matthewjasper
Copy link
Contributor Author

@bors r+

@bors
Copy link
Contributor

bors commented May 31, 2018

📌 Commit b83daea has been approved by matthewjasper

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 31, 2018
@Mark-Simulacrum
Copy link
Member

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented May 31, 2018

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Contributor

bors commented May 31, 2018

📌 Commit b83daea has been approved by nikomatsakis

@bors
Copy link
Contributor

bors commented May 31, 2018

⌛ Testing commit b83daea with merge efc508b...

bors added a commit that referenced this pull request May 31, 2018
…nikomatsakis

Register outlives predicates from queries the right way around.

Closes #49354
The region constraints from queries need to be reversed from sub to outlives.

Note: wf checking reports these errors before NLL, so I'm not sure if there's any case when these predicates need to be created at all.

cc @nikomatsakis
@bors
Copy link
Contributor

bors commented Jun 1, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing efc508b to master...

@bors bors merged commit b83daea into rust-lang:master Jun 1, 2018
@matthewjasper matthewjasper deleted the reverse-normalization-bounds branch September 3, 2018 21:32
@matthewjasper matthewjasper restored the reverse-normalization-bounds branch September 3, 2018 21:32
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.

6 participants