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 const_eval_raw query return just an AllocId #55720

Merged
merged 4 commits into from
Nov 20, 2018
Merged

Make const_eval_raw query return just an AllocId #55720

merged 4 commits into from
Nov 20, 2018

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Nov 6, 2018

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 6, 2018
@oli-obk
Copy link
Contributor

oli-obk commented Nov 6, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Nov 6, 2018

📌 Commit f4051c7052a4e64ad7d034475201e34a1fefce08 has been approved by oli-obk

@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 Nov 6, 2018
@RalfJung
Copy link
Member Author

RalfJung commented Nov 6, 2018

Uh, I accidentally pressed the submit button, wanted to make things a bit nicer in miri as well.^^ I will push that to this branch. (The PR wouldn't land any time soon anyway.)

@bors
Copy link
Contributor

bors commented Nov 7, 2018

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

@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 Nov 7, 2018
@RalfJung RalfJung added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 7, 2018
@RalfJung
Copy link
Member Author

RalfJung commented Nov 7, 2018

Fixed rebase, can now be reviewed.

@oli-obk
Copy link
Contributor

oli-obk commented Nov 7, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Nov 7, 2018

📌 Commit 4cf59944a41fd61c2eacbcfa82e9fa18506d3f2d has been approved by oli-obk

@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 Nov 7, 2018
@bors

This comment has been minimized.

Sign in to view
@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 Nov 7, 2018
@RalfJung
Copy link
Member Author

RalfJung commented Nov 8, 2018

Rebased.

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Nov 8, 2018

📌 Commit 51fb6eee2b688c2551d514adf70280ba3b2c808f has been approved by oli-obk

@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 Nov 8, 2018
@bors
Copy link
Contributor

bors commented Nov 11, 2018

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

@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 Nov 11, 2018
@kennytm
Copy link
Member

kennytm commented Nov 18, 2018

@bors retry #56034

@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 Nov 18, 2018
@bors
Copy link
Contributor

bors commented Nov 19, 2018

⌛ Testing commit 7451530331e5079e2ec4b764793956771612417b with merge 04af8a1f6d3d5c5fa3591b44186359b4c8206758...

@bors
Copy link
Contributor

bors commented Nov 19, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 19, 2018
@oli-obk
Copy link
Contributor

oli-obk commented Nov 19, 2018

@bors retry #56034

@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 Nov 19, 2018
@bors
Copy link
Contributor

bors commented Nov 19, 2018

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

@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 Nov 19, 2018
@RalfJung
Copy link
Member Author

Rebased.

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Nov 19, 2018

📌 Commit 612febc has been approved by oli-obk

@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 Nov 19, 2018
@bors
Copy link
Contributor

bors commented Nov 20, 2018

⌛ Testing commit 612febc with merge c4cf115...

bors added a commit that referenced this pull request Nov 20, 2018
@bors
Auto merge of #55720 - RalfJung:const-eval-raw, r=oli-obk
c4cf115 
Make const_eval_raw query return just an AllocId

r? @oli-obk
@bors
Copy link
Contributor

bors commented Nov 20, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: oli-obk
Pushing c4cf115 to master...

@bors bors merged commit 612febc into rust-lang:master Nov 20, 2018
This was referenced Nov 20, 2018
Merged
Merged
@RalfJung RalfJung deleted the const-eval-raw branch November 30, 2018 08:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oli-obk oli-obk oli-obk left review comments

Assignees

@oli-obk oli-obk

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@RalfJung @oli-obk @bors @kennytm @rust-highfive