Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve the error message for missing else clauses in if expressions
- Loading branch information
Jakub Wieczorek
committed
Oct 13, 2014
1 parent
4a382d7
commit 43e5d10
Showing
5 changed files
with
63 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
fn main() { | ||
let a = if true { | ||
0 | ||
} else if false { | ||
//~^ ERROR if may be missing an else clause: expected `()`, found `<generic integer #1>` | ||
1 | ||
}; | ||
} |
43e5d10
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from pcwalton
at https://github.com/jakub-/rust/commit/43e5d10428dd2b74e8afe367c46bb0f2b6c37246
43e5d10
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging jakub-/rust/issue-4201 = 43e5d10 into auto
43e5d10
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jakub-/rust/issue-4201 = 43e5d10 merged ok, testing candidate = 126f224
43e5d10
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/1803
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/1802
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/1795
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/1802
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/1797
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/1796
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/1796
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/1800
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/1794
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/1793
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/1796
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/1452
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/1451
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/1453
success: http://buildbot.rust-lang.org/builders/auto-win-64-opt/builds/290
success: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-t/builds/291
success: http://buildbot.rust-lang.org/builders/auto-win-64-nopt-c/builds/283
43e5d10
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-forwarding master to auto = 126f224