From a08f3a7d4d937c2b26c8a29edabe7fb089d0b5f7 Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Thu, 23 Aug 2012 14:46:59 -0700
Subject: More complete fix to #3162 (borrowck bug related to access to rec
 fields)

---
 src/libsyntax/parse/common.rs | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'src/libsyntax/parse')

diff --git a/src/libsyntax/parse/common.rs b/src/libsyntax/parse/common.rs
index afb9c91fc8d..e68a8120992 100644
--- a/src/libsyntax/parse/common.rs
+++ b/src/libsyntax/parse/common.rs
@@ -146,19 +146,12 @@ impl parser: parser_common {
 
     fn eat_keyword(word: ~str) -> bool {
         self.require_keyword(word);
-
-        let mut bump = false;
-        let val = match self.token {
-          token::IDENT(sid, false) => {
-            if word == *self.id_to_str(sid) {
-                bump = true;
-                true
-            } else { false }
-          }
+        let is_kw = match self.token {
+          token::IDENT(sid, false) => (word == *self.id_to_str(sid)),
           _ => false
         };
-        if bump { self.bump() }
-        val
+        if is_kw { self.bump() }
+        is_kw
     }
 
     fn expect_keyword(word: ~str) {
-- 
cgit 1.4.1-3-g733a5