diff options
| author | Nick Desaulniers <ndesaulniers@mozilla.com> | 2013-01-31 18:24:09 -0800 |
|---|---|---|
| committer | Nick Desaulniers <ndesaulniers@mozilla.com> | 2013-02-01 00:15:42 -0800 |
| commit | 7868b6bf550dcb1b74f25178bcac73d6ec767993 (patch) | |
| tree | b9449845e6244b4e8a47d8986dd5c5823f698ace /src/libfuzzer | |
| parent | 6fb4239bb361a927582a8ffd53a2ae649d810fdf (diff) | |
| download | rust-7868b6bf550dcb1b74f25178bcac73d6ec767993.tar.gz rust-7868b6bf550dcb1b74f25178bcac73d6ec767993.zip | |
Remove fail keyword from lexer & parser and clean up remaining calls to
fail Fix merge conflicts - Issue 4524
Diffstat (limited to 'src/libfuzzer')
| -rw-r--r-- | src/libfuzzer/fuzzer.rc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/libfuzzer/fuzzer.rc b/src/libfuzzer/fuzzer.rc index 8b1ac845f4f..566ff65b15e 100644 --- a/src/libfuzzer/fuzzer.rc +++ b/src/libfuzzer/fuzzer.rc @@ -84,9 +84,6 @@ pub fn common_exprs() -> ~[ast::expr] { ~[dse(ast::expr_break(option::None)), dse(ast::expr_again(option::None)), - dse(ast::expr_fail(option::None)), - dse(ast::expr_fail(option::Some( - @dse(ast::expr_lit(@dsl(ast::lit_str(@~"boo"))))))), dse(ast::expr_ret(option::None)), dse(ast::expr_lit(@dsl(ast::lit_nil))), dse(ast::expr_lit(@dsl(ast::lit_bool(false)))), @@ -117,11 +114,10 @@ pub pure fn safe_to_use_expr(e: ast::expr, tm: test_mode) -> bool { ast::expr_binary(*) | ast::expr_assign(*) | ast::expr_assign_op(*) => { false } - ast::expr_fail(option::None) | ast::expr_ret(option::None) => { false } // https://github.com/mozilla/rust/issues/953 - ast::expr_fail(option::Some(_)) => { false } + //ast::expr_fail(option::Some(_)) => { false } // https://github.com/mozilla/rust/issues/928 //ast::expr_cast(_, _) { false } |