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

[on-demand] Turn monomorphic_const_eval into a proper query, not just a cache. #41310

Merged
merged 3 commits into from
Apr 18, 2017

Conversation

eddyb
Copy link
Member

@eddyb eddyb commented Apr 15, 2017

The error definitions and reporting logic, alongside with eval_length were moved to librustc.
Both local and cross-crate constant evaluation is on-demand now, but the latter is only used for enum discriminants, to replace the manual insertion into the cache which was done when decoding variants.

r? @nikomatsakis

@eddyb eddyb requested a review from nikomatsakis April 15, 2017 01:18
@arielb1 arielb1 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Apr 15, 2017
@bors
Copy link
Contributor

bors commented Apr 15, 2017

☔ The latest upstream changes (presumably #41319) made this pull request unmergeable. Please resolve the merge conflicts.

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Apr 17, 2017

📌 Commit 6dc21b7 has been approved by nikomatsakis

@nikomatsakis
Copy link
Contributor

Thanks @eddyb :)

@bors
Copy link
Contributor

bors commented Apr 18, 2017

⌛ Testing commit 6dc21b7 with merge 88792cb...

@bors
Copy link
Contributor

bors commented Apr 18, 2017

💔 Test failed - status-appveyor

@alexcrichton
Copy link
Member

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 18, 2017
…akis

[on-demand] Turn monomorphic_const_eval into a proper query, not just a cache.

The error definitions and reporting logic, alongside with `eval_length` were moved to `librustc`.
Both local and cross-crate constant evaluation is on-demand now, but the latter is only used for `enum` discriminants, to replace the manual insertion into the cache which was done when decoding variants.

r? @nikomatsakis
bors added a commit that referenced this pull request Apr 18, 2017
Rollup of 3 pull requests

- Successful merges: #41262, #41310, #41344
- Failed merges:
@bors bors merged commit 6dc21b7 into rust-lang:master Apr 18, 2017
@bors
Copy link
Contributor

bors commented Apr 18, 2017

⌛ Testing commit 6dc21b7 with merge e621e1c...

@bors
Copy link
Contributor

bors commented Apr 18, 2017

☔ The latest upstream changes (presumably #41357) made this pull request unmergeable. Please resolve the merge conflicts.

@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-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants