diff options
| author | bors <bors@rust-lang.org> | 2015-02-14 17:01:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-02-14 17:01:11 +0000 |
| commit | b63cee4a11fcfecf20ed8419bc3bd6859e6496bc (patch) | |
| tree | e614f946a2e7811fe886a52ee19899a4ede35dd9 /src/libsyntax/parse/lexer | |
| parent | 3d1c1added595c1c3410a1b72d8f0134942e4e24 (diff) | |
| parent | 07d00deab22dc07ffc58b8e74d45596242ca8b15 (diff) | |
| download | rust-b63cee4a11fcfecf20ed8419bc3bd6859e6496bc.tar.gz rust-b63cee4a11fcfecf20ed8419bc3bd6859e6496bc.zip | |
Auto merge of #22158 - Kimundi:the_lonely_uppercase_keyword, r=pnkfelix
It is only allowed in paths now, where it will either work inside a `trait` or `impl` item, or not resolve outside of it. [breaking-change] Closes #22137
Diffstat (limited to 'src/libsyntax/parse/lexer')
| -rw-r--r-- | src/libsyntax/parse/lexer/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs index ecc39925a40..1a4afa4957c 100644 --- a/src/libsyntax/parse/lexer/mod.rs +++ b/src/libsyntax/parse/lexer/mod.rs @@ -1122,7 +1122,7 @@ impl<'a> StringReader<'a> { let keyword_checking_token = &token::Ident(keyword_checking_ident, token::Plain); let last_bpos = self.last_pos; - if keyword_checking_token.is_keyword(token::keywords::Self) { + if keyword_checking_token.is_keyword(token::keywords::SelfValue) { self.err_span_(start, last_bpos, "invalid lifetime name: 'self \ |