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

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

Closed
wants to merge 2 commits into from
Closed

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

wants to merge 2 commits into from

Conversation

nikomatsakis
Copy link
Contributor

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

r? @eddyb

eddyb
eddyb reviewed Mar 9, 2017
View reviewed changes
src/librustc/hir/mod.rs Outdated
@@ -930,7 +930,7 @@ pub enum Expr_ {
/// An `if` block, with an optional else block
///
/// `if expr { block } else { expr }`
Copy link
Member

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 approved these changes Mar 9, 2017
View reviewed changes
Copy link
Member

@eddyb eddyb 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 with the comment and the title ("then type") fixed

@eddyb
Copy link
Member

eddyb commented Mar 9, 2017

@bors r+

@bors
Copy link
Contributor

bors commented Mar 9, 2017

📌 Commit 002950b has been approved by eddyb

@TimNN
Copy link
Contributor

TimNN commented Mar 9, 2017

Travis failed:

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

@eddyb
Copy link
Member

eddyb commented Mar 9, 2017

@bors r-

@nrc nrc assigned eddyb Mar 9, 2017
@bors
Copy link
Contributor

bors commented Mar 21, 2017

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

@nikomatsakis
Copy link
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
Reviewers

@eddyb eddyb eddyb approved these changes

Assignees

@eddyb eddyb

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nikomatsakis @eddyb @bors @TimNN