Fix span calculation on secondary_label as well

2021-12-05 15:55:41 -08:00
parent e2116acae5
commit 99bd24e9a3
3 changed files with 22 additions and 2 deletions
--- a/compiler/rustc_builtin_macros/src/format.rs
+++ b/compiler/rustc_builtin_macros/src/format.rs
@@ -995,8 +995,9 @@ pub fn expand_preparsed_format_args(
            e.note(&note);
        }
        if let Some((label, span)) = err.secondary_label {
-            let sp = fmt_span.from_inner(span);
-            e.span_label(sp, label);
+            if efmt_kind_is_lit {
+                e.span_label(fmt_span.from_inner(span), label);
+            }
        }
        e.emit();
        return DummyResult::raw_expr(sp, true);