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/libsyntax/parse/token.rs | |
| 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/libsyntax/parse/token.rs')
| -rw-r--r-- | src/libsyntax/parse/token.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index bcf4281132d..843b0edcfc9 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -487,7 +487,7 @@ pub fn strict_keyword_table() -> HashMap<~str, ()> { ~"const", ~"copy", ~"do", ~"drop", ~"else", ~"enum", ~"extern", - ~"fail", ~"false", ~"fn", ~"for", + ~"false", ~"fn", ~"for", ~"if", ~"impl", ~"let", ~"log", ~"loop", ~"match", ~"mod", ~"move", ~"mut", |