Avoid incorrect argument suggestions in macros

Author: estebank

compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs

@@ -31,7 +31,7 @@ use rustc_middle::ty::visit::TypeVisitableExt;
 use rustc_middle::ty::{self, IsSuggestable, Ty};
 use rustc_session::Session;
 use rustc_span::symbol::{kw, Ident};
-use rustc_span::{self, sym, BytePos, Span};
+use rustc_span::{self, sym, BytePos, ExpnKind, Span};
 use rustc_trait_selection::traits::{self, ObligationCauseCode, SelectionContext};
 
 use std::iter;
@@ -1211,6 +1211,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         // Call out where the function is defined
         self.label_fn_like(&mut err, fn_def_id, callee_ty, None, is_method);
 
+        if !suggestions.iter().all(|(sp, _)| {
+            sp.macro_backtrace().all(|data| !matches!(data.kind, ExpnKind::Macro(..)))
+        }) {
+            // We don't want to provide structured suggestions if macros are involved at all.
+            err.emit();
+            return;
+        }
         // And add a suggestion block for all of the parameters
         let suggestion_text = match suggestion_text {
             SuggestionText::None => None,

tests/ui/argument-suggestions/extra_arguments.stderr

@@ -266,14 +266,6 @@ note: function defined here
 LL | fn empty() {}
    |    ^^^^^
    = note: this error originates in the macro `foo` (in Nightly builds, run with -Z macro-backtrace for more info)
-help: remove the extra arguments
-   |
-LL ~         empty($x, );
-LL |     }
- ...
-LL |   );
-LL ~   foo!();
-   |
 
 error: aborting due to 16 previous errors
 

tests/ui/macros/issue-26094.rs

@@ -9,5 +9,4 @@ fn some_function() {} //~ NOTE defined here
 fn main() {
     some_macro!(some_function);
     //~^ ERROR function takes 0 arguments but 1 argument was supplied
-    //~| NOTE in this expansion of some_macro!
 }

tests/ui/macros/issue-26094.stderr

@@ -2,10 +2,7 @@ error[E0061]: this function takes 0 arguments but 1 argument was supplied
   --> $DIR/issue-26094.rs:10:17
    |
 LL |         $other(None)
-   |                ----
-   |                |
-   |                unexpected argument of type `Option<_>`
-   |                help: remove the extra argument
+   |                ---- unexpected argument of type `Option<_>`
 ...
 LL |     some_macro!(some_function);
    |                 ^^^^^^^^^^^^^