Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix ICE when reporting closure and proc mismatch
Closes #13599
- Loading branch information
Showing
3 changed files
with
54 additions
and
22 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
// Copyright 2012-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. | ||
|
||
// Test that a mismatched proc / closure type is correctly reported. | ||
|
||
fn expect_closure(_: ||) {} | ||
|
||
fn expect_proc(_: proc()) {} | ||
|
||
fn main() { | ||
expect_closure(proc() {}); | ||
//~^ ERROR mismatched types: expected `||` but found `proc()` (expected closure, found proc) | ||
|
||
expect_proc(|| {}); | ||
//~^ ERROR mismatched types: expected `proc()` but found `||` (expected proc, found closure) | ||
} |
741142e
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 alexcrichton
at edwardw@741142e
741142e
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 edwardw/rust/ppaux-ice = 741142e into auto
741142e
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.
edwardw/rust/ppaux-ice = 741142e merged ok, testing candidate = 92f6b92
741142e
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/5380
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/5376
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/4469
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/4482
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/5478
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/4566
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/4574
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/5480
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/4565
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/4571
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/4634
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/2365
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/5475
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/4570
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/4585
741142e
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 = 92f6b92