diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2020-07-09 11:50:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-09 11:50:50 -0700 |
| commit | 9353e21bfdea148e910b2530270a3418db836bf3 (patch) | |
| tree | 7bafe998869c457ebaa9f82179f49c37baf7a551 /src/librustc_parse/parser | |
| parent | 31d53decd06f9cd854bbfe11f03abcd398e396b6 (diff) | |
| parent | e771a4f989644fd6397c391af1db94d459980b2e (diff) | |
Rollup merge of #74188 - estebank:tweak-ascription-typo-heuristic, r=petrochenkov
Tweak `::` -> `:` typo heuristic and reduce verbosity Do not trigger on correct type ascription expressions with trailing operators and _do_ trigger on likely path typos where a turbofish is used. On likely path typos, remove note explaining type ascription. Clean up indentation. r? @petrochenkov
Diffstat (limited to 'src/librustc_parse/parser')
| -rw-r--r-- | src/librustc_parse/parser/diagnostics.rs | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/librustc_parse/parser/diagnostics.rs b/src/librustc_parse/parser/diagnostics.rs index 7822c097390..3244b35e89b 100644 --- a/src/librustc_parse/parser/diagnostics.rs +++ b/src/librustc_parse/parser/diagnostics.rs @@ -346,13 +346,16 @@ impl<'a> Parser<'a> { if allow_unstable { // Give extra information about type ascription only if it's a nightly compiler. err.note( - "`#![feature(type_ascription)]` lets you annotate an expression with a \ - type: `<expr>: <type>`", - ); - err.note( - "see issue #23416 <https://github.com/rust-lang/rust/issues/23416> \ - for more information", + "`#![feature(type_ascription)]` lets you annotate an expression with a type: \ + `<expr>: <type>`", ); + if !likely_path { + // Avoid giving too much info when it was likely an unrelated typo. + err.note( + "see issue #23416 <https://github.com/rust-lang/rust/issues/23416> \ + for more information", + ); + } } } } @@ -1161,8 +1164,10 @@ impl<'a> Parser<'a> { } && !self.token.is_reserved_ident() && // v `foo:bar(baz)` self.look_ahead(1, |t| t == &token::OpenDelim(token::Paren)) - || self.look_ahead(1, |t| t == &token::Lt) && // `foo:bar<baz` - self.look_ahead(2, |t| t.is_ident()) + || self.look_ahead(1, |t| t == &token::OpenDelim(token::Brace)) // `foo:bar {` + || self.look_ahead(1, |t| t == &token::Colon) && // `foo:bar::<baz` + self.look_ahead(2, |t| t == &token::Lt) && + self.look_ahead(3, |t| t.is_ident()) || self.look_ahead(1, |t| t == &token::Colon) && // `foo:bar:baz` self.look_ahead(2, |t| t.is_ident()) || self.look_ahead(1, |t| t == &token::ModSep) |