about summary refs log tree commit diff
path: root/src/libsyntax/parse/lexer
diff options
context:
space:
mode:
authorMarvin Löbel <loebel.marvin@gmail.com>2015-02-10 14:55:45 +0100
committerMarvin Löbel <loebel.marvin@gmail.com>2015-02-12 22:04:31 +0100
commit07d00deab22dc07ffc58b8e74d45596242ca8b15 (patch)
tree4171afb6d0be091c7a72224d326a558256ee30f0 /src/libsyntax/parse/lexer
parentde8bc44753881aacdaf435f5ba61de3c20916761 (diff)
downloadrust-07d00deab22dc07ffc58b8e74d45596242ca8b15.tar.gz
rust-07d00deab22dc07ffc58b8e74d45596242ca8b15.zip
Made `Self` a keyword.
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.rs2
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 \