diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_typeck/src/collect.rs | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/compiler/rustc_typeck/src/collect.rs b/compiler/rustc_typeck/src/collect.rs index 23b328b9186..84315cb6827 100644 --- a/compiler/rustc_typeck/src/collect.rs +++ b/compiler/rustc_typeck/src/collect.rs @@ -1306,18 +1306,13 @@ fn trait_def(tcx: TyCtxt<'_>, def_id: DefId) -> ty::TraitDef { }) // Check for duplicates .and_then(|list| { - let mut set: FxHashSet<&Ident> = FxHashSet::default(); + let mut set: FxHashMap<Symbol, Span> = FxHashMap::default(); let mut no_dups = true; for ident in &*list { - if let Some(dup) = set.replace(ident) { - let dup2 = set.get(&dup).copied().unwrap(); // We've just inserted it - + if let Some(dup) = set.insert(ident.name, ident.span) { tcx.sess - .struct_span_err( - vec![dup.span, dup2.span], - "Functions names are duplicated", - ) + .struct_span_err(vec![dup, ident.span], "Functions names are duplicated") .note( "All `#[rustc_must_implement_one_of]` arguments \ must be unique", |