Skip to content

Commit 14fc313

Browse files
paulstansifergraydon
authored andcommitted
---
yaml --- r: 2583 b: refs/heads/master c: 1fdc75e h: refs/heads/master i: 2581: 4cc17fd 2579: 588953a 2575: c4e3d2b v: v3
1 parent 26fd46b commit 14fc313

File tree

4 files changed

+15
-2
lines changed

4 files changed

+15
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: f7df3696dea28f3bba9913d020e748e084f62920
2+
refs/heads/master: 1fdc75ee7cf1d498a413287b5444cdb4242c04c6

trunk/src/comp/front/parser.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -898,7 +898,6 @@ fn parse_bottom_expr(parser p) -> @ast::expr {
898898
ex = expand_syntax_ext(p, es.span, pth, es.node,
899899
none[str]);
900900
} else if (eat_word(p, "fail")) {
901-
p.bump();
902901
ex = ast::expr_fail(p.get_ann());
903902
} else if (eat_word(p, "log")) {
904903
auto e = parse_expr(p);
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// -*- rust -*-
2+
3+
// error-pattern: after expression but found
4+
fn main() {
5+
fail @ ;
6+
}

trunk/src/test/run-pass/parse-fail.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// -*- rust -*-
2+
3+
fn dont_call_me() {
4+
fail;
5+
log 1;
6+
}
7+
8+
fn main() {}

0 commit comments

Comments
 (0)