about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorTim Chevalier <chevalier@alum.wellesley.edu>2013-01-08 13:49:21 -0800
committerTim Chevalier <chevalier@alum.wellesley.edu>2013-01-08 13:49:21 -0800
commit2791877009996dba1a4c7b84fbd7af01ac36bd04 (patch)
tree4ce8b2220f434828c27481f66adfa7d49bd012c3 /src/libsyntax/parse
parentdd73dd0e37d17ecfec4fb9a38d4cfd68dcf299eb (diff)
parent816cb8c5350084e04770b9c3a133400923bd2e1b (diff)
downloadrust-2791877009996dba1a4c7b84fbd7af01ac36bd04.tar.gz
rust-2791877009996dba1a4c7b84fbd7af01ac36bd04.zip
Merge pull request #4388 from lkuper/alt-to-match
Rename identifiers that still use 'alt' to use 'match'
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/parser.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index f85ca3fefef..f32a782622a 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -940,7 +940,7 @@ impl Parser {
         } else if self.eat_keyword(~"loop") {
             return self.parse_loop_expr();
         } else if self.eat_keyword(~"match") {
-            return self.parse_alt_expr();
+            return self.parse_match_expr();
         } else if self.eat_keyword(~"fn") {
             let opt_proto = self.parse_fn_ty_proto();
             let proto = match opt_proto {
@@ -1722,7 +1722,7 @@ impl Parser {
         return expr_rec(fields, base);
     }
 
-    fn parse_alt_expr() -> @expr {
+    fn parse_match_expr() -> @expr {
         let lo = self.last_span.lo;
         let discriminant = self.parse_expr();
         self.expect(token::LBRACE);