Skip to content

Fix MIR text output for terminators since they were wrapped in Option. - #30771

Merged
bors merged 1 commit into
rust-lang:masterfrom
solson:mir-text-terminator-fix
Jan 11, 2016
Merged

Fix MIR text output for terminators since they were wrapped in Option.#30771
bors merged 1 commit into
rust-lang:masterfrom
solson:mir-text-terminator-fix

Conversation

@solson

@solsonsolson commented Jan 7, 2016

Copy link
Copy Markdown
Contributor

This just removes the Some() that appeared around terminators in MIR text output after #30481 (cc @nagisa). The graphviz is already fixed.

r? @eddyb

@eddyb

eddyb commented Jan 7, 2016

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jan 7, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 8e29367 has been approved by eddyb

@bors

bors commented Jan 8, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 8e29367 with merge 01c86ea...

bors added a commit that referenced this pull request Jan 8, 2016
@bors
Auto merge of#30771- tsion:mir-text-terminator-fix, r=eddyb
01c86ea
This just removes the `Some()` that appeared around terminators in MIR text output after #30481 (cc @nagisa). The graphviz is already fixed.
r? @eddyb
@bors

bors commented Jan 8, 2016

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-mac-64-opt

@nrc

nrc commented Jan 8, 2016

Copy link
Copy Markdown
Member

@bors retry

@bors

bors commented Jan 8, 2016

Copy link
Copy Markdown
Collaborator

⚡ Previous build results for auto-linux-32-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-win-msvc-32-opt are reusable. Rebuilding only auto-linux-32-nopt-t, auto-linux-64-debug-opt, auto-linux-64-x-android-t, auto-mac-64-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-64-opt...

@bors

bors commented Jan 8, 2016

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-linux-32-nopt-t

@solson

solson commented Jan 8, 2016

Copy link
Copy Markdown
ContributorAuthor

Yet another timeout failure. This commit is simple enough and the tests passed on other platforms, so it could probably just be rolled up.

@brson

brson commented Jan 8, 2016

Copy link
Copy Markdown
Contributor

@bors rollup

@brson

brson commented Jan 8, 2016

Copy link
Copy Markdown
Contributor

@bors retry

nagisa added a commit to nagisa/rust that referenced this pull request Jan 9, 2016
@nagisa
Rollup merge ofrust-lang#30771- tsion:mir-text-terminator-fix, r=eddyb
c826e13
This just removes the `Some()` that appeared around terminators in MIR text output after rust-lang#30481 (cc @nagisa). The graphviz is already fixed.
r? @eddyb
@nagisanagisa mentioned this pull request Jan 9, 2016
Closed
steveklabnik added a commit to steveklabnik/rust that referenced this pull request Jan 9, 2016
@steveklabnik
Rollup merge ofrust-lang#30771- tsion:mir-text-terminator-fix, r=eddyb
c0983cd
This just removes the `Some()` that appeared around terminators in MIR text output after rust-lang#30481 (cc @nagisa). The graphviz is already fixed.
r? @eddyb
@steveklabniksteveklabnik mentioned this pull request Jan 9, 2016
Merged
bors added a commit that referenced this pull request Jan 11, 2016
@bors
Auto merge of#30800- steveklabnik:rollup, r=steveklabnik
0672ed4
- Successful merges: #30766, #30771, #30789
- Failed merges:
@bors
bors merged commit 8e29367 into rust-lang:masterJan 11, 2016
@solson
solson deleted the mir-text-terminator-fix branch January 15, 2016 01:39
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@eddybeddyb

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@solson@eddyb@bors@nrc@brson