Skip to content

Querify entry_fn #57573

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Jan 19, 2019
Merged

Querify entry_fn #57573

merged 2 commits into from
Jan 19, 2019

Conversation

Xanewok
Copy link
Member

@Xanewok Xanewok commented Jan 13, 2019

Analogous to #57570 but this will also require few fixups in Miri so I decided to separate that (and it seems CI doesn't let us break tools anymore? Or was that because it was a rollup PR?)

r? @nikomatsakis

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 13, 2019
@Zoxc
Copy link
Contributor

Zoxc commented Jan 14, 2019

r=me with the nit addressed. You'll also need to wait until we can break tools again, since those can't be broken the week before a release.

@Xanewok
Copy link
Member Author

Xanewok commented Jan 14, 2019

Ah right, makes sense. Gonna wait with this until the release then.

@bors
Copy link
Collaborator

bors commented Jan 15, 2019

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

Copy link
Contributor

@nikomatsakis nikomatsakis 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 as well

@Zoxc
Copy link
Contributor

Zoxc commented Jan 18, 2019

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 18, 2019

📌 Commit b7cd24d has been approved by Zoxc

@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 Jan 18, 2019
Centril added a commit to Centril/rust that referenced this pull request Jan 19, 2019
Querify `entry_fn`

Analogous to rust-lang#57570 but this will also require few fixups in Miri so I decided to separate that (and it seems [CI doesn't let us break tools anymore](rust-lang#57392 (comment))? Or was that because it was a rollup PR?)

r? @nikomatsakis
bors added a commit that referenced this pull request Jan 19, 2019
Rollup of 10 pull requests

Successful merges:

 - #57268 (Add a target option "merge-functions", and a corresponding -Z flag (works around #57356))
 - #57476 (Move glob map use to query and get rid of CrateAnalysis)
 - #57501 (High priority resolutions for associated variants)
 - #57573 (Querify `entry_fn`)
 - #57610 (Fix nested `?` matchers)
 - #57634 (Remove an unused function argument)
 - #57653 (Make the contribution doc reference the guide more)
 - #57666 (Generalize `huge-enum.rs` test and expected stderr for more cross platform cases)
 - #57698 (Fix typo bug in DepGraph::try_mark_green().)
 - #57746 (Update README.md)

Failed merges:

r? @ghost
@bors bors merged commit b7cd24d into rust-lang:master Jan 19, 2019
@Xanewok Xanewok deleted the querify-entry-fn branch January 19, 2019 14:36
# for free to join this conversation on GitHub. Already have an account? # 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