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

rename FalseEdges -> FalseEdge #72908

Merged
merged 1 commit into from
Jun 7, 2020
Merged

rename FalseEdges -> FalseEdge #72908

merged 1 commit into from
Jun 7, 2020

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Jun 2, 2020

There's just a single false edge in this terminator, not multiple of them.

r? @matthewjasper @jonas-schievink

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 2, 2020
@matthewjasper
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jun 2, 2020

📌 Commit 7018663f5bb0a7ad2f70d5941e40d76c637d9ba6 has been approved by matthewjasper

@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 Jun 2, 2020
@RalfJung
Copy link
Member Author

RalfJung commented Jun 2, 2020

This will conflict with #72810, letting that land first.
@bors r-

@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 Jun 2, 2020
@RalfJung RalfJung added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 2, 2020
@oli-obk oli-obk added the A-MIR Area: Mid-level IR (MIR) - https://blog.rust-lang.org/2016/04/19/MIR.html label Jun 6, 2020
@bors
Copy link
Contributor

bors commented Jun 7, 2020

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

@RalfJung
Copy link
Member Author

RalfJung commented Jun 7, 2020

@bors r=matthewjasper rollup

@bors
Copy link
Contributor

bors commented Jun 7, 2020

📌 Commit d931b03 has been approved by matthewjasper

@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-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Jun 7, 2020
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Jun 7, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 7, 2020
@bors
Auto merge of rust-lang#73093 - Dylan-DPC:rollup-9gh5tyu, r=Dylan-DPC
f9fdf64 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#72764 (Be more careful around ty::Error in generators)
 - rust-lang#72908 (rename FalseEdges -> FalseEdge)
 - rust-lang#72970 (Properly handle feature-gated lints)
 - rust-lang#72998 (Mention that some atomic operations may not be available on some platforms)
 - rust-lang#73063 (Elide type on liballoc vec)

Failed merges:

r? @ghost
@bors bors merged commit cbab745 into rust-lang:master Jun 7, 2020
@RalfJung RalfJung deleted the false-edge branch June 10, 2020 07:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@matthewjasper matthewjasper

Labels
A-MIR Area: Mid-level IR (MIR) - https://blog.rust-lang.org/2016/04/19/MIR.html 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 @matthewjasper @bors @oli-obk @rust-highfive