diff options
| author | bors <bors@rust-lang.org> | 2013-02-13 17:11:08 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-02-13 17:11:08 -0800 |
| commit | 0ae74bef188fe4f1fff69c0fa85d308c40bce7f8 (patch) | |
| tree | f5258cb43faeb5f36f816e4a2d04442c987423b4 /src/libsyntax/parse/parser.rs | |
| parent | c51ecc3223ed64b7948f40097c5083da0c201811 (diff) | |
| parent | 4445b38df27777b043cad9ecc2452daad3469949 (diff) | |
| download | rust-0ae74bef188fe4f1fff69c0fa85d308c40bce7f8.tar.gz rust-0ae74bef188fe4f1fff69c0fa85d308c40bce7f8.zip | |
auto merge of #4905 : brson/rust/issue4524, r=brson
Rebase of #4895
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 6382413b081..1fcd99e1946 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2538,7 +2538,7 @@ pub impl Parser { _ => None } } - _ => die!() + _ => fail!() }; match maybe_bound { @@ -3907,7 +3907,7 @@ pub impl Parser { let metadata = self.parse_optional_meta(); view_item_use(ident, metadata, self.get_id()) } else { - die!(); + fail!(); }; self.expect(token::SEMI); @ast::view_item { node: node, |