not suggest if span originates in a derive-macro's expansion

rust-lang · Apr 10, 2022 · f49601d · f49601d
1 parent f50da2e
commit f49601d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/compiler/rustc_parse/src/parser/item.rs b/compiler/rustc_parse/src/parser/item.rs
@@ -1231,7 +1231,7 @@ impl<'a> Parser<'a> {
                 }
                 let enum_field_start_span = this.token.span;
                 let ident = this.parse_field_ident("enum", vlo)?;
-                if this.token.kind == token::Colon {
+                if this.token.kind == token::Colon && !start_span.in_derive_expansion() {
                     let snapshot = this.clone();
                     this.bump();
                     match this.parse_ty() {
@@ -1612,7 +1612,7 @@ impl<'a> Parser<'a> {
             {
                 let snapshot = self.clone();
                 if let Err(err) = self.parse_ty() {
-                    if let Some(span) = start_span {
+                    if let Some(span) = start_span && !span.in_derive_expansion() {
                         error.span_suggestion_verbose(
                             span,
                             "consider using `enum` instead of `struct`",

diff --git a/src/test/ui/proc-macro/derive-bad.stderr b/src/test/ui/proc-macro/derive-bad.stderr
@@ -5,10 +5,6 @@ LL | #[derive(A)]
    |          ^ expected `:`
    |
    = note: this error originates in the derive macro `A` (in Nightly builds, run with -Z macro-backtrace for more info)
-help: consider using `enum` instead of `struct`
-   |
-LL | #[derive(enum)]
-   |          ~~~~
 
 error: proc-macro derive produced unparseable tokens
   --> $DIR/derive-bad.rs:6:10