Skip to content

Commit d2e7953

Browse files
committed
Move raw_identifiers check to the lexer.
1 parent 7d5c29b commit d2e7953

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/libsyntax/parse/lexer/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1155,6 +1155,10 @@ impl<'a> StringReader<'a> {
11551155
&format!("`r#{}` is not currently supported.", ident.name)
11561156
).raise();
11571157
}
1158+
if is_raw_ident {
1159+
let span = self.mk_sp(raw_start, self.pos);
1160+
self.sess.raw_identifier_spans.borrow_mut().push(span);
1161+
}
11581162
token::Ident(ident, is_raw_ident)
11591163
}));
11601164
}

src/libsyntax/parse/parser.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,7 @@ impl<'a> Parser<'a> {
784784

785785
fn parse_ident_common(&mut self, recover: bool) -> PResult<'a, ast::Ident> {
786786
match self.token {
787-
token::Ident(i, is_raw) => {
787+
token::Ident(i, _) => {
788788
if self.token.is_reserved_ident() {
789789
let mut err = self.expected_ident_found();
790790
if recover {
@@ -793,9 +793,6 @@ impl<'a> Parser<'a> {
793793
return Err(err);
794794
}
795795
}
796-
if is_raw {
797-
self.sess.raw_identifier_spans.borrow_mut().push(self.span);
798-
}
799796
self.bump();
800797
Ok(i)
801798
}

0 commit comments

Comments
 (0)