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 there's an incorrect enum variant constructor in match arm. Closes #15896.
- Loading branch information
Showing
2 changed files
with
27 additions
and
1 deletion.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
// 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. | ||
|
||
// Regression test for #15896. It used to ICE rustc. | ||
|
||
fn main() { | ||
enum R { REB(()) } | ||
struct Tau { t: uint } | ||
enum E { B(R, Tau) } | ||
|
||
let e = B(REB(()), Tau { t: 3 }); | ||
let u = match e { | ||
B( | ||
Tau{t: x}, //~ ERROR mismatched types | ||
_) => x, | ||
}; | ||
} |
c3f4c6d
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@c3f4c6d
c3f4c6d
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/issue-15896 = c3f4c6d into auto
c3f4c6d
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/issue-15896 = c3f4c6d merged ok, testing candidate = a455345
c3f4c6d
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/504
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/504
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/503
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/504
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/504
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/505
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/504
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/510
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/505
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/504
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/507
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/505
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/505
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/506
c3f4c6d
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 = a455345