Do not emit help when shorthand from macro when suggest ? or expect

Signed-off-by: xizheyin <[email protected]>

Author: xizheyin

compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs

@@ -2034,6 +2034,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         };
 
         let sugg = match self.tcx.hir_maybe_get_struct_pattern_shorthand_field(expr) {
+            Some(_) if expr.span.from_expansion() => return false,
             Some(ident) => format!(": {ident}{sugg}"),
             None => sugg.to_string(),
         };

tests/ui/typeck/macro-shorthand-issue-140659.rs

@@ -45,7 +45,6 @@ fn process<T: Reencode>(op: &Operator, reencoder: &mut T) -> Instruction {
         };
     }
 
-    // This should give the specific error message with the wrong help suggestion
     for_each_operator!(translate)
 }
 

tests/ui/typeck/macro-shorthand-issue-140659.stderr

@@ -10,10 +10,6 @@ LL |     for_each_operator!(translate)
    = note: expected type `u32`
               found enum `Result<u32, <T as Reencode>::Error>`
    = note: this error originates in the macro `translate` which comes from the expansion of the macro `for_each_operator` (in Nightly builds, run with -Z macro-backtrace for more info)
-help: consider using `Result::expect` to unwrap the `Result<u32, <T as Reencode>::Error>` value, panicking if the value is a `Result::Err`
-   |
-LL |         }: tag_index.expect("REASON")
-   |          ++++++++++++++++++++++++++++
 
 error: aborting due to 1 previous error