Merge remote-tracking branch 'origin/master' into proc_macro_api

2017-07-05 08:42:13 -07:00
parent d316874c87 692b572236
commit fd95db25b3
605 changed files with 6469 additions and 3681 deletions
--- a/src/libsyntax/parse/lexer/mod.rs
+++ b/src/libsyntax/parse/lexer/mod.rs
@@ -1285,7 +1285,7 @@ impl<'a> StringReader<'a> {
                    });
                    let keyword_checking_token = &token::Ident(keyword_checking_ident);
                    let last_bpos = self.pos;
-                    if keyword_checking_token.is_any_keyword() &&
+                    if keyword_checking_token.is_reserved_ident() &&
                       !keyword_checking_token.is_keyword(keywords::Static) {
                        self.err_span_(start, last_bpos, "lifetimes cannot use keyword names");
                    }