Skip to content

Commit 19d100b

Browse files
matthiaskrgrmatthiaskrgr
authored
Rollup merge of #116838 - gurry:116836-dup-macro-invoc-diag, r=petrochenkov
Fix duplicate labels emitted in `render_multispan_macro_backtrace()` This PR replaces the `Vec` used to store labels with an `FxIndexSet` in order to eliminate duplicates Fixes #116836
2 parents dbbe6e5 + 88c8714 commit 19d100b

File tree

4 files changed

+12
-40
lines changed

4 files changed

+12
-40
lines changed

‎compiler/rustc_errors/src/emitter.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use crate::{
2323
use rustc_lint_defs::pluralize;
2424

2525
use derive_setters::Setters;
26-
use rustc_data_structures::fx::{FxHashMap, FxIndexMap};
26+
use rustc_data_structures::fx::{FxHashMap, FxIndexMap, FxIndexSet};
2727
use rustc_data_structures::sync::{DynSend, IntoDynSyncSend, Lrc};
2828
use rustc_error_messages::{FluentArgs, SpanLabel};
2929
use rustc_span::hygiene::{ExpnKind, MacroKind};
@@ -370,7 +370,7 @@ pub trait Emitter: Translate {
370370
}
371371

372372
fn render_multispan_macro_backtrace(&self, span: &mut MultiSpan, always_backtrace: bool) {
373-
let mut new_labels: Vec<(Span, String)> = vec![];
373+
let mut new_labels = FxIndexSet::default();
374374

375375
for &sp in span.primary_spans() {
376376
if sp.is_dummy() {
@@ -387,7 +387,7 @@ pub trait Emitter: Translate {
387387
}
388388

389389
if always_backtrace {
390-
new_labels.push((
390+
new_labels.insert((
391391
trace.def_site,
392392
format!(
393393
"in this expansion of `{}`{}",
@@ -431,7 +431,7 @@ pub trait Emitter: Translate {
431431
format!("this {} desugaring", kind.descr()).into()
432432
}
433433
};
434-
new_labels.push((
434+
new_labels.insert((
435435
trace.call_site,
436436
format!(
437437
"in {}{}",

‎tests/ui/asm/x86_64/interpolated-idents.stderr

+1-6
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,7 @@ LL | asm!("", $in(x) x, $out(x) x, $lateout(x) x, $inout(x) x, $in
3333
LL | / m!(in out lateout inout inlateout const sym
3434
LL | | pure nomem readonly preserves_flags
3535
LL | | noreturn nostack att_syntax options);
36-
| | -
37-
| |___________________________________________|
38-
| |___________________________________________in this macro invocation
39-
| |___________________________________________in this macro invocation
40-
| |___________________________________________in this macro invocation
41-
| in this macro invocation
36+
| |___________________________________________- in this macro invocation
4237
|
4338
= note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
4439

‎tests/ui/rust-2018/edition-lint-infer-outlives-multispan.stderr

+1-6
Original file line numberDiff line numberDiff line change
@@ -861,12 +861,7 @@ LL | $($name: 'a, $name: 'a, )+;
861861
| ^^^^^^^^^ ^^^^^^^^^
862862
...
863863
LL | m!(T0 T1 T2 T3 T4 T5 T6 T7 T8 T9 T10 T11 T12 T13 T14 T15);
864-
| ---------------------------------------------------------
865-
| |
866-
| in this macro invocation
867-
| in this macro invocation
868-
| in this macro invocation
869-
| in this macro invocation
864+
| --------------------------------------------------------- in this macro invocation
870865
|
871866
= note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
872867
help: remove these bounds

‎tests/ui/typeck/issue-116473-ice-wrong-span-variant-args.stderr

+6-24
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@ LL | ($variant:tt) => (if let EnumUnit::$variant::<i32, u32> {} = 5 { true }
77
| not allowed on this type
88
...
99
LL | recursive_tt!();
10-
| ---------------
11-
| |
12-
| in this macro invocation
13-
| in this macro invocation
10+
| --------------- in this macro invocation
1411
|
1512
= note: enum variants can't have type parameters
1613
= note: this error originates in the macro `recursive_tt` (in Nightly builds, run with -Z macro-backtrace for more info)
@@ -44,10 +41,7 @@ LL | ($variant:ident) => (if let EnumUnit::$variant::<i32, u32> {} = 5 { tru
4441
| ^^^ ^^^ type argument not allowed
4542
...
4643
LL | recursive_ident!();
47-
| ------------------
48-
| |
49-
| in this macro invocation
50-
| in this macro invocation
44+
| ------------------ in this macro invocation
5145
|
5246
= note: enum variants can't have type parameters
5347
= note: this error originates in the macro `recursive_ident` (in Nightly builds, run with -Z macro-backtrace for more info)
@@ -81,10 +75,7 @@ LL | ($variant:tt) => (if let EnumUnit::$variant::<i32, u32> {} = 5 { true }
8175
| not allowed on this type
8276
...
8377
LL | nested1_tt!();
84-
| -------------
85-
| |
86-
| in this macro invocation
87-
| in this macro invocation
78+
| ------------- in this macro invocation
8879
|
8980
= note: enum variants can't have type parameters
9081
= note: this error originates in the macro `nested2_tt` which comes from the expansion of the macro `nested1_tt` (in Nightly builds, run with -Z macro-backtrace for more info)
@@ -119,10 +110,7 @@ LL | ($variant:ident) => (if let EnumUnit::$variant::<i32, u32> {} = 5 { tru
119110
| ^^^ ^^^ type argument not allowed
120111
...
121112
LL | nested1_ident!();
122-
| ----------------
123-
| |
124-
| in this macro invocation
125-
| in this macro invocation
113+
| ---------------- in this macro invocation
126114
|
127115
= note: enum variants can't have type parameters
128116
= note: this error originates in the macro `nested2_ident` which comes from the expansion of the macro `nested1_ident` (in Nightly builds, run with -Z macro-backtrace for more info)
@@ -156,10 +144,7 @@ LL | ($arg1:tt, $arg2:tt) => (if let EnumUnit::VariantB::<$arg1, $arg2> {}
156144
| not allowed on this type
157145
...
158146
LL | nested1_tt_args_in_first_macro!();
159-
| ---------------------------------
160-
| |
161-
| in this macro invocation
162-
| in this macro invocation
147+
| --------------------------------- in this macro invocation
163148
|
164149
= note: enum variants can't have type parameters
165150
= note: this error originates in the macro `nested1_tt_args_in_first_macro` (in Nightly builds, run with -Z macro-backtrace for more info)
@@ -194,10 +179,7 @@ LL | ($arg1:ident, $arg2:ident) => (if let EnumUnit::VariantB::<$arg1, $arg2
194179
| not allowed on this type
195180
...
196181
LL | nested1_ident_args_in_first_macro!();
197-
| ------------------------------------
198-
| |
199-
| in this macro invocation
200-
| in this macro invocation
182+
| ------------------------------------ in this macro invocation
201183
|
202184
= note: enum variants can't have type parameters
203185
= note: this error originates in the macro `nested2_ident_args_in_first_macro` which comes from the expansion of the macro `nested1_ident_args_in_first_macro` (in Nightly builds, run with -Z macro-backtrace for more info)

0 commit comments

Comments
 (0)