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

Fix ICE building gluon_vm #41377

Merged
merged 2 commits into from
Apr 20, 2017
Merged

Conversation

nikomatsakis
Copy link
Contributor

The problem was due to various places we were failing to propagate obligations. I think I got them mostly correct, but I didn't get around to writing test cases for each case.

r? @eddyb or @arielb1

});
.map(|InferOk { obligations, .. }| {
fulfillment_cx.borrow_mut()
.register_predicate_obligations(infcx, obligations);
Copy link
Member

Choose a reason for hiding this comment

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

IMO this should be using the equivalent inh instead... or not construct an Inherited at all.

Copy link
Member

@eddyb eddyb 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 regardless of what you choose to do with Inherited

@eddyb
Copy link
Member

eddyb commented Apr 18, 2017

Wait, #41325 isn't merged yet, that explains why that code looks old. What are the intended interactions between the two PRSs?

@nikomatsakis
Copy link
Contributor Author

Hmm, doesn't seem that they overlap much, but I can try to merge on top of that one.

@eddyb
Copy link
Member

eddyb commented Apr 19, 2017

#41325 merged, please rebase.

@nikomatsakis
Copy link
Contributor Author

@bors r=eddyb

@bors
Copy link
Contributor

bors commented Apr 19, 2017

📌 Commit 93e1097 has been approved by eddyb

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 19, 2017
…nce, r=eddyb

Fix ICE building gluon_vm

The problem was due to various places we were failing to propagate obligations. I think I got them mostly correct, but I didn't get around to writing test cases for each case.

r? @eddyb or @arielb1
@aidanhs aidanhs added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 19, 2017
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 20, 2017
…nce, r=eddyb

Fix ICE building gluon_vm

The problem was due to various places we were failing to propagate obligations. I think I got them mostly correct, but I didn't get around to writing test cases for each case.

r? @eddyb or @arielb1
bors added a commit that referenced this pull request Apr 20, 2017
Rollup of 5 pull requests

- Successful merges: #41214, #41369, #41377, #41378, #41390
- Failed merges:
@bors bors merged commit 93e1097 into rust-lang:master Apr 20, 2017
@bors
Copy link
Contributor

bors commented Apr 20, 2017

⌛ Testing commit 93e1097 with merge fa6b50f...

@eddyb
Copy link
Member

eddyb commented Apr 20, 2017

@bors retry Already merged

@arielb1
Copy link
Contributor

arielb1 commented Apr 21, 2017

@bors r-

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