Unrolled build for #148717

Rollup merge of #148717 - estebank:macro-spans-2, r=petrochenkov

Point at span within local macros even when error happens in nested external macro

Address issue noticed at https://users.rust-lang.org/t/error-message-does-not-specify-where-in-macro/135157/1. On errors occurring within a macro expansion, point at the innermost local macro expansion point.

```
error[E0308]: mismatched types
  --> $DIR/macro-span-caller-replacement.rs:5:17
   |
LL |             s = format!("{arg}");
   |                 ^^^^^^^^^^^^^^^^ expected `&str`, found `String`
...
LL |     macro_with_format!();
   |     -------------------- in this macro invocation
   |
   = note: this error originates in the macro `format` which comes from the expansion of the macro `macro_with_format` (in Nightly builds, run with -Z macro-backtrace for more info)
```

Author: rust-timer

compiler/rustc_errors/src/emitter.rs

@@ -474,9 +474,12 @@ pub trait Emitter {
             .chain(span.span_labels().iter().map(|sp_label| sp_label.span))
             .filter_map(|sp| {
                 if !sp.is_dummy() && source_map.is_imported(sp) {
-                    let maybe_callsite = sp.source_callsite();
-                    if sp != maybe_callsite {
-                        return Some((sp, maybe_callsite));
+                    let mut span = sp;
+                    while let Some(callsite) = span.parent_callsite() {
+                        span = callsite;
+                        if !source_map.is_imported(span) {
+                            return Some((sp, span));
+                        }
                     }
                 }
                 None

src/tools/miri/tests/fail/panic/tls_macro_drop_panic.rs

@@ -1,7 +1,7 @@
 //@error-in-other-file: aborted execution
 // Backtraces vary wildly between platforms, we have to normalize away almost the entire thing
 //@normalize-stderr-test: "'main'|'<unnamed>'" -> "$$NAME"
-//@normalize-stderr-test: ".*(note|-->|\|).*\n" -> ""
+//@normalize-stderr-test: ".*(note|-->|:::|\|).*\n" -> ""
 
 pub struct NoisyDrop {}
 

tests/ui-fulldeps/rustc-dev-remap.only-remap.stderr

@@ -18,6 +18,9 @@ help: the following other types implement trait `VisitorResult`
    = note: `ControlFlow<T>`
 note: required by a bound in `rustc_ast::visit::Visitor::Result`
   --> /rustc-dev/xyz/compiler/rustc_ast/src/visit.rs:LL:COL
+  ::: /rustc-dev/xyz/compiler/rustc_ast/src/visit.rs:LL:COL
+   |
+   = note: in this macro invocation
    = note: this error originates in the macro `common_visitor_and_walkers` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 1 previous error

tests/ui-fulldeps/rustc-dev-remap.remap-unremap.stderr

@@ -20,8 +20,11 @@ LL | impl<T> VisitorResult for ControlFlow<T> {
 note: required by a bound in `rustc_ast::visit::Visitor::Result`
   --> $COMPILER_DIR_REAL/rustc_ast/src/visit.rs:LL:COL
    |
+LL |                 type Result: VisitorResult = ();
+   |                              ^^^^^^^^^^^^^ required by this bound in `Visitor::Result`
+...
 LL | common_visitor_and_walkers!(Visitor<'a>);
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `Visitor::Result`
+   | ---------------------------------------- in this macro invocation
    = note: this error originates in the macro `common_visitor_and_walkers` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 1 previous error

tests/ui-fulldeps/session-diagnostic/diagnostic-derive-doc-comment-field.stderr

@@ -15,6 +15,9 @@ LL | struct NotIntoDiagArg;
    = help: normalized in stderr
 note: required by a bound in `Diag::<'a, G>::arg`
   --> $COMPILER_DIR/rustc_errors/src/diagnostic.rs:LL:CC
+  ::: $COMPILER_DIR/rustc_errors/src/diagnostic.rs:LL:CC
+   |
+   = note: in this macro invocation
    = note: this error originates in the macro `with_fn` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `NotIntoDiagArg: IntoDiagArg` is not satisfied
@@ -34,6 +37,9 @@ LL | struct NotIntoDiagArg;
    = help: normalized in stderr
 note: required by a bound in `Diag::<'a, G>::arg`
   --> $COMPILER_DIR/rustc_errors/src/diagnostic.rs:LL:CC
+  ::: $COMPILER_DIR/rustc_errors/src/diagnostic.rs:LL:CC
+   |
+   = note: in this macro invocation
    = note: this error originates in the macro `with_fn` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors

tests/ui-fulldeps/session-diagnostic/diagnostic-derive.stderr

@@ -665,6 +665,9 @@ LL | struct Hello {}
    = help: normalized in stderr
 note: required by a bound in `Diag::<'a, G>::arg`
   --> $COMPILER_DIR/rustc_errors/src/diagnostic.rs:LL:CC
+  ::: $COMPILER_DIR/rustc_errors/src/diagnostic.rs:LL:CC
+   |
+   = note: in this macro invocation
    = note: this error originates in the macro `with_fn` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 85 previous errors

tests/ui/binop/binary-op-suggest-deref.stderr

@@ -305,13 +305,19 @@ LL |     let _ = FOO & (*"Sized".to_string().into_boxed_str());
 help: the following other types implement trait `BitAnd<Rhs>`
   --> $SRC_DIR/core/src/ops/bit.rs:LL:COL
    |
-   = note: `&i32` implements `BitAnd<i32>`
+   = note: `i32` implements `BitAnd`
+  ::: $SRC_DIR/core/src/ops/bit.rs:LL:COL
    |
-   = note: `&i32` implements `BitAnd`
+   = note: in this macro invocation
+  --> $SRC_DIR/core/src/internal_macros.rs:LL:COL
+   |
+   = note: `&i32` implements `BitAnd<i32>`
+  ::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
    |
    = note: `i32` implements `BitAnd<&i32>`
+  ::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
    |
-   = note: `i32` implements `BitAnd`
+   = note: `&i32` implements `BitAnd`
    = note: this error originates in the macro `bitand_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the size for values of type `str` cannot be known at compilation time

tests/ui/binop/binop-mul-i32-f32.stderr

@@ -8,13 +8,19 @@ LL |     x * y
 help: the following other types implement trait `Mul<Rhs>`
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
    |
-   = note: `&i32` implements `Mul<i32>`
+   = note: `i32` implements `Mul`
+  ::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
    |
-   = note: `&i32` implements `Mul`
+   = note: in this macro invocation
+  --> $SRC_DIR/core/src/internal_macros.rs:LL:COL
+   |
+   = note: `&i32` implements `Mul<i32>`
+  ::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
    |
    = note: `i32` implements `Mul<&i32>`
+  ::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
    |
-   = note: `i32` implements `Mul`
+   = note: `&i32` implements `Mul`
    = note: this error originates in the macro `mul_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 1 previous error

tests/ui/const-generics/adt_const_params/const_param_ty_bad.stderr

@@ -84,6 +84,9 @@ LL |     check(&mut () as *mut ());
    |
 help: the trait `ConstParamTy_` is implemented for `()`
   --> $SRC_DIR/core/src/marker.rs:LL:COL
+  ::: $SRC_DIR/core/src/marker.rs:LL:COL
+   |
+   = note: in this macro invocation
 note: required by a bound in `check`
   --> $DIR/const_param_ty_bad.rs:4:18
    |
@@ -101,6 +104,9 @@ LL |     check(&() as *const ());
    |
 help: the trait `ConstParamTy_` is implemented for `()`
   --> $SRC_DIR/core/src/marker.rs:LL:COL
+  ::: $SRC_DIR/core/src/marker.rs:LL:COL
+   |
+   = note: in this macro invocation
 note: required by a bound in `check`
   --> $DIR/const_param_ty_bad.rs:4:18
    |

tests/ui/consts/const-eval/const-eval-overflow-3b.stderr

@@ -14,13 +14,19 @@ LL |     = [0; (i8::MAX + 1u8) as usize];
 help: the following other types implement trait `Add<Rhs>`
   --> $SRC_DIR/core/src/ops/arith.rs:LL:COL
    |
-   = note: `&i8` implements `Add<i8>`
+   = note: `i8` implements `Add`
+  ::: $SRC_DIR/core/src/ops/arith.rs:LL:COL
    |
-   = note: `&i8` implements `Add`
+   = note: in this macro invocation
+  --> $SRC_DIR/core/src/internal_macros.rs:LL:COL
+   |
+   = note: `&i8` implements `Add<i8>`
+  ::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
    |
    = note: `i8` implements `Add<&i8>`
+  ::: $SRC_DIR/core/src/internal_macros.rs:LL:COL
    |
-   = note: `i8` implements `Add`
+   = note: `&i8` implements `Add`
    = note: this error originates in the macro `add_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors