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.
This commit is contained in:
Michael Goulet 2023-02-08 20:01:26 -08:00 committed by GitHub
commit ab09405e99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 2 deletions

View File

@ -694,8 +694,9 @@ fn parse_generic_bounds_common(
// `where`, so stop if it's it. // `where`, so stop if it's it.
// We also continue if we find types (not traits), again for error recovery. // We also continue if we find types (not traits), again for error recovery.
while self.can_begin_bound() while self.can_begin_bound()
|| self.token.can_begin_type() || (self.may_recover()
|| (self.token.is_reserved_ident() && !self.token.is_keyword(kw::Where)) && (self.token.can_begin_type()
|| (self.token.is_reserved_ident() && !self.token.is_keyword(kw::Where))))
{ {
if self.token.is_keyword(kw::Dyn) { if self.token.is_keyword(kw::Dyn) {
// Account for `&dyn Trait + dyn Other`. // Account for `&dyn Trait + dyn Other`.

View File

@ -0,0 +1,15 @@
// check-pass
// edition:2021
// for the `impl` + keyword test
macro_rules! impl_primitive {
($ty:ty) => {
compile_error!("whoops");
};
(impl async) => {};
}
impl_primitive!(impl async);
fn main() {}

View File

@ -0,0 +1,17 @@
// check-pass
macro_rules! impl_primitive {
($ty:ty) => { impl_primitive!(impl $ty); };
(impl $ty:ty) => { fn a(_: $ty) {} }
}
impl_primitive! { u8 }
macro_rules! test {
($ty:ty) => { compile_error!("oh no"); };
(impl &) => {};
}
test!(impl &);
fn main() {}