fixed macro in foreign crate

Author: Kivooeo

compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs

@@ -1546,7 +1546,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             SuggestionText::Reorder => Some("reorder these arguments".to_string()),
             SuggestionText::DidYouMean => Some("did you mean".to_string()),
         };
-        if let Some(suggestion_text) = suggestion_text {
+        if let Some(suggestion_text) = suggestion_text
+            && !full_call_span.in_external_macro(self.sess().source_map())
+        {
             let source_map = self.sess().source_map();
             let suggestion_span = if let Some(args_span) = error_span.trim_start(full_call_span) {
                 // Span of the braces, e.g. `(a, b, c)`.

tests/ui/not-enough-arguments.rs

@@ -19,11 +19,19 @@ fn bar(a: i32, b: i32, c: i32, d: i32, e: i32, f: i32) {
     println!("{}", f);
 }
 
+macro_rules! delegate_local {
+    ($method:ident) => {
+        <Self>::$method(8)
+        //~^ ERROR function takes 2 arguments but 1
+    };
+}
+
 struct Bar;
 
 impl Bar {
     fn foo(a: u8, b: u8) {}
     fn bar() {
+        delegate_local!(foo);
         delegate!(foo);
         //~^ ERROR function takes 2 arguments but 1
     }

tests/ui/not-enough-arguments.stderr

@@ -1,23 +1,38 @@
 error[E0061]: this function takes 2 arguments but 1 argument was supplied
-  --> $DIR/not-enough-arguments.rs:27:9
+  --> $DIR/not-enough-arguments.rs:24:9
    |
-LL |         delegate!(foo);
-   |         ^^^^^^^^^^^^^^ argument #2 of type `u8` is missing
+LL |         <Self>::$method(8)
+   |         ^^^^^^^^^^^^^^^--- argument #2 of type `u8` is missing
+...
+LL |         delegate_local!(foo);
+   |         -------------------- in this macro invocation
    |
 note: associated function defined here
-  --> $DIR/not-enough-arguments.rs:25:8
+  --> $DIR/not-enough-arguments.rs:32:8
    |
 LL |     fn foo(a: u8, b: u8) {}
    |        ^^^        -----
-   = note: this error originates in the macro `delegate` (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the macro `delegate_local` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: provide the argument
-  --> $DIR/auxiliary/delegate_macro.rs:4:26
    |
 LL |         <Self>::$method(8, /* u8 */)
    |                          ++++++++++
 
+error[E0061]: this function takes 2 arguments but 1 argument was supplied
+  --> $DIR/not-enough-arguments.rs:35:9
+   |
+LL |         delegate!(foo);
+   |         ^^^^^^^^^^^^^^ argument #2 of type `u8` is missing
+   |
+note: associated function defined here
+  --> $DIR/not-enough-arguments.rs:32:8
+   |
+LL |     fn foo(a: u8, b: u8) {}
+   |        ^^^        -----
+   = note: this error originates in the macro `delegate` (in Nightly builds, run with -Z macro-backtrace for more info)
+
 error[E0061]: this function takes 4 arguments but 3 arguments were supplied
-  --> $DIR/not-enough-arguments.rs:33:5
+  --> $DIR/not-enough-arguments.rs:41:5
    |
 LL |     foo(1, 2, 3);
    |     ^^^--------- argument #4 of type `isize` is missing
@@ -33,7 +48,7 @@ LL |     foo(1, 2, 3, /* isize */);
    |                +++++++++++++
 
 error[E0061]: this function takes 6 arguments but 3 arguments were supplied
-  --> $DIR/not-enough-arguments.rs:35:5
+  --> $DIR/not-enough-arguments.rs:43:5
    |
 LL |     bar(1, 2, 3);
    |     ^^^--------- three arguments of type `i32`, `i32`, and `i32` are missing
@@ -48,6 +63,6 @@ help: provide the arguments
 LL |     bar(1, 2, 3, /* i32 */, /* i32 */, /* i32 */);
    |                +++++++++++++++++++++++++++++++++
 
-error: aborting due to 3 previous errors
+error: aborting due to 4 previous errors
 
 For more information about this error, try `rustc --explain E0061`.