Skip to content

rename FalseEdges -> FalseEdge - #72908

Merged
bors merged 1 commit into
rust-lang:masterfrom
RalfJung:false-edge
Jun 7, 2020
Merged

rename FalseEdges -> FalseEdge#72908
bors merged 1 commit into
rust-lang:masterfrom
RalfJung:false-edge

Conversation

@RalfJung

@RalfJungRalfJung commented Jun 2, 2020

Copy link
Copy Markdown
Member

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

r? @matthewjasper@jonas-schievink

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

matthewjasper commented Jun 2, 2020

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jun 2, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 7018663f5bb0a7ad2f70d5941e40d76c637d9ba6 has been approved by matthewjasper

@borsbors 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

RalfJung commented Jun 2, 2020

Copy link
Copy Markdown
MemberAuthor

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

@borsbors 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
@RalfJungRalfJung added S-blocked Status: 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-obkoli-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

bors commented Jun 7, 2020

Copy link
Copy Markdown
Collaborator

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

@RalfJung

RalfJung commented Jun 7, 2020

Copy link
Copy Markdown
MemberAuthor

@bors r=matthewjasper rollup

@bors

bors commented Jun 7, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit d931b03 has been approved by matthewjasper

@borsbors 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: Blocked on something else such as an RFC or other implementation work. labels Jun 7, 2020
@Dylan-DPC-zzDylan-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 ofrust-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:masterJun 7, 2020
@RalfJung
RalfJung deleted the false-edge branch June 10, 2020 07:40
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@matthewjaspermatthewjasper

Labels

A-MIRArea: Mid-level IR (MIR) - https://blog.rust-lang.org/2016/04/19/MIR.htmlS-waiting-on-borsStatus: 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