Skip to content

refactor if so that the "then type" is an expression#40391

Closed
nikomatsakis wants to merge 2 commits into
rust-lang:masterfrom
nikomatsakis:refactor-if
Closed

refactor if so that the "then type" is an expression#40391
nikomatsakis wants to merge 2 commits into
rust-lang:masterfrom
nikomatsakis:refactor-if

Conversation

@nikomatsakis

Copy link
Copy Markdown
Contributor

This is a useful refactoring that I want for other branches.

r? @eddyb

Comment thread src/librustc/hir/mod.rs Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment should be updated.

@eddyb eddyb left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me with the comment and the title ("then type") fixed

@eddyb

eddyb commented Mar 9, 2017

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Mar 9, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 002950b has been approved by eddyb

@TimNN

TimNN commented Mar 9, 2017

Copy link
Copy Markdown
Contributor

Travis failed:

/checkout/src/librustc_typeck/check/mod.rs:2765: line longer than 100 chars

@eddyb

eddyb commented Mar 9, 2017

Copy link
Copy Markdown
Contributor

@bors r-

@nrc nrc assigned eddyb Mar 9, 2017
@bors

bors commented Mar 21, 2017

Copy link
Copy Markdown
Collaborator

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

@nikomatsakis

Copy link
Copy Markdown
Contributor Author

closing this PR; I'll roll the change into #40224

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants