diff options
| author | Michael Goulet <michael@errs.io> | 2023-02-08 20:01:26 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-08 20:01:26 -0800 |
| commit | ab09405e99ec2a0feab5750eed67c8a35051f5f3 (patch) | |
| tree | 891702b5fb22991effdf2b6109c5d4feb8f2874c /compiler/rustc_parse/src | |
| parent | 46c7c91ce746e9edb94dad5a4d4d5fd682582c78 (diff) | |
| parent | 0017822b708d2dde46fa603592d322951dc7ba0a (diff) | |
| download | rust-ab09405e99ec2a0feab5750eed67c8a35051f5f3.tar.gz rust-ab09405e99ec2a0feab5750eed67c8a35051f5f3.zip | |
Rollup merge of #107813 - compiler-errors:bad-impl-trait-in-macro-is-ok, r=estebank
Do not eagerly recover for bad `impl Trait` types in macros Fixes #107796 cc #106712, ```@estebank``` and ```@Ezrashaw``` please make sure to use [`Parser::may_recover`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_parse/parser/struct.Parser.html#method.may_recover) for all eager-token-consuming parser recoveries. This also fixes a separate regression from #99915, that was introduced before we added `may_recover` though.
Diffstat (limited to 'compiler/rustc_parse/src')
| -rw-r--r-- | compiler/rustc_parse/src/parser/ty.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/rustc_parse/src/parser/ty.rs b/compiler/rustc_parse/src/parser/ty.rs index a19ea04fa5e..5b92563fc35 100644 --- a/compiler/rustc_parse/src/parser/ty.rs +++ b/compiler/rustc_parse/src/parser/ty.rs @@ -694,8 +694,9 @@ impl<'a> Parser<'a> { // `where`, so stop if it's it. // We also continue if we find types (not traits), again for error recovery. while self.can_begin_bound() - || self.token.can_begin_type() - || (self.token.is_reserved_ident() && !self.token.is_keyword(kw::Where)) + || (self.may_recover() + && (self.token.can_begin_type() + || (self.token.is_reserved_ident() && !self.token.is_keyword(kw::Where)))) { if self.token.is_keyword(kw::Dyn) { // Account for `&dyn Trait + dyn Other`. |