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

Rustup #4857

Merged
merged 6 commits into from
Nov 29, 2019
Merged

Rustup #4857

merged 6 commits into from
Nov 29, 2019

Conversation

Manishearth
Copy link
Member

From rust-lang/rust#66246

changelog: none

@Manishearth
Copy link
Member Author

@matthewjasper could you have a look at this? Specifically the "fix categorizations" commit, I'm not sure if that's the right fix for the cases that were recursively looping

Also, I'm not sure where I should be getting an infcx from, tcx.infer_ctxt(|| { ... })?

Copy link
Contributor

@matthewjasper matthewjasper left a comment

Choose a reason for hiding this comment

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

Also, I'm not sure where I should be getting an infcx from, tcx.infer_ctxt(|| { ... })?

tcx.infer_ctxt().enter(|| { ... })

fn consume(&mut self, cmt: &cmt_<'tcx>, mode: ConsumeMode) {
if let Categorization::Local(lid) = cmt.cat {
fn consume(&mut self, cmt: &Place<'tcx>, mode: ConsumeMode) {
if let PlaceBase::Local(lid) = cmt.base {
Copy link
Contributor

Choose a reason for hiding this comment

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

In this file there should also be a check that cmt.projections is empty.

Copy link
Member

Choose a reason for hiding this comment

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

I just added it to every method of the EUV. It didn't break anything, so I think this should be ok?

@flip1995 flip1995 changed the title [WIP] Rustup Rustup Nov 29, 2019
@flip1995 flip1995 added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Nov 29, 2019
@oli-obk
Copy link
Contributor

oli-obk commented Nov 29, 2019

@bors r=matthewjasper,oli-obk

@bors
Copy link
Contributor

bors commented Nov 29, 2019

📌 Commit 604e6ba has been approved by matthewjasper,oli-obk

@bors
Copy link
Contributor

bors commented Nov 29, 2019

⌛ Testing commit 604e6ba with merge 4780ac0...

bors added a commit that referenced this pull request Nov 29, 2019
@bors
Copy link
Contributor

bors commented Nov 29, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: matthewjasper,oli-obk
Pushing 4780ac0 to master...

@bors bors merged commit 604e6ba into master Nov 29, 2019
@flip1995 flip1995 deleted the rustup branch November 29, 2019 13:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants