---

yaml
---
r: 13243
b: refs/heads/master
c: ae6d8d1
h: refs/heads/master
i:
  13241: a2c2386
  13239: b7fc991
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 7803488a43eb24864105506b3825f605bc87d693
+refs/heads/master: ae6d8d1b4dc5a150e1aa62ba52cd534b15e45c1d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libsyntax/parse/lexer.rs

@@ -389,7 +389,12 @@ fn next_token_inner(rdr: reader) -> token::token {
         if rdr.curr == '=' {
             rdr.bump();
             ret token::EQEQ;
-        } else { ret token::EQ; }
+        } else if rdr.curr == '>' {
+            rdr.bump();
+            ret token::FAT_ARROW;
+        } else {
+            ret token::EQ;
+        }
       }
       '!' {
         rdr.bump();

trunk/src/libsyntax/parse/parser.rs

@@ -1281,6 +1281,7 @@ class parser {
             let pats = self.parse_pats();
             let mut guard = none;
             if self.eat_keyword("if") { guard = some(self.parse_expr()); }
+            if self.token == token::FAT_ARROW { self.bump(); }
             let blk = self.parse_block();
             arms += [{pats: pats, guard: guard, body: blk}];
         }

trunk/src/libsyntax/parse/token.rs

@@ -45,6 +45,7 @@ enum token {
     RARROW,
     LARROW,
     DARROW,
+    FAT_ARROW,
     LPAREN,
     RPAREN,
     LBRACKET,
@@ -111,6 +112,7 @@ fn to_str(in: interner<str>, t: token) -> str {
       RARROW { ret "->"; }
       LARROW { ret "<-"; }
       DARROW { ret "<->"; }
+      FAT_ARROW { ret "=>"; }
       LPAREN { ret "("; }
       RPAREN { ret ")"; }
       LBRACKET { ret "["; }