user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #66592 - estebank:raw-raw-ah-ah-ah, r=cramertj

Browse source 
Rework raw ident suggestions

Use heuristics to determine whethersuggesting raw identifiers is
appropriate.

Account for raw identifiers when printing a path in a `use` suggestion.

Fix #66126.
This commit is contained in:
bors 2019-11-24 14:08:08 +00:00
commit 5a1d028d4c
10 changed files with 63 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/librustc_parse/parser/diagnostics.rs
View file

@ -225,8 +225,21 @@ impl<'a> Parser<'a> {
self.token.span,
&format!("expected identifier, found {}", self.this_token_descr()),
);
let valid_follow = &[
TokenKind::Eq,
TokenKind::Colon,
TokenKind::Comma,
TokenKind::Semi,
TokenKind::ModSep,
TokenKind::OpenDelim(token::DelimToken::Brace),
TokenKind::OpenDelim(token::DelimToken::Paren),
TokenKind::CloseDelim(token::DelimToken::Brace),
TokenKind::CloseDelim(token::DelimToken::Paren),
];
if let token::Ident(name, false) = self.token.kind {
if Ident::new(name, self.token.span).is_raw_guess() {
if Ident::new(name, self.token.span).is_raw_guess() &&
self.look_ahead(1, |t| valid_follow.contains(&t.kind))
{
err.span_suggestion(
self.token.span,
"you can escape reserved keywords to use them as identifiers",