about summary refs log tree commit diff
path: root/src/libsyntax/parse/parser.rs
diff options
context:
space:
mode:
authorMark Simulacrum <mark.simulacrum@gmail.com>2017-03-04 12:37:45 -0700
committerMark Simulacrum <mark.simulacrum@gmail.com>2017-03-04 18:02:04 -0700
commit69899b7f27b1a9511abea9d2187def6967d7d7f7 (patch)
treecb5f564f9d02978b74bfca896158c1e7c9e8885b /src/libsyntax/parse/parser.rs
parentba07bd5d23aced6d4baa5696213b11ca832c1a5d (diff)
downloadrust-69899b7f27b1a9511abea9d2187def6967d7d7f7.tar.gz
rust-69899b7f27b1a9511abea9d2187def6967d7d7f7.zip
Inline function to avoid naming confusion.
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
-rw-r--r--src/libsyntax/parse/parser.rs14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 6e3724b5fd8..6c566dab1d6 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -1032,13 +1032,6 @@ impl<'a> Parser<'a> {
         self.check_unknown_macro_variable();
     }
 
-    /// Advance the parser by one token and return the bumped token.
-    pub fn bump_and_get(&mut self) -> token::Token {
-        let old_token = mem::replace(&mut self.token, token::Underscore);
-        self.bump();
-        old_token
-    }
-
     /// Advance the parser using provided token as a next one. Use this when
     /// consuming a part of a token. For example a single `<` from `<<`.
     pub fn bump_with(&mut self,
@@ -2663,7 +2656,12 @@ impl<'a> Parser<'a> {
                 }));
             },
             token::CloseDelim(_) | token::Eof => unreachable!(),
-            _ => Ok(TokenTree::Token(self.span, self.bump_and_get())),
+            _ => {
+                let token = mem::replace(&mut self.token, token::Underscore);
+                let res = Ok(TokenTree::Token(self.span, token));
+                self.bump();
+                res
+            }
         }
     }