diff options
Diffstat (limited to 'crates/hir_def/src/resolver.rs')
-rw-r--r-- | crates/hir_def/src/resolver.rs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/crates/hir_def/src/resolver.rs b/crates/hir_def/src/resolver.rs index f8cc5e075..cc66dcf31 100644 --- a/crates/hir_def/src/resolver.rs +++ b/crates/hir_def/src/resolver.rs | |||
@@ -483,6 +483,7 @@ pub enum ScopeDef { | |||
483 | 483 | ||
484 | impl Scope { | 484 | impl Scope { |
485 | fn process_names(&self, db: &dyn DefDatabase, f: &mut dyn FnMut(Name, ScopeDef)) { | 485 | fn process_names(&self, db: &dyn DefDatabase, f: &mut dyn FnMut(Name, ScopeDef)) { |
486 | let mut seen = FxHashSet::default(); | ||
486 | match self { | 487 | match self { |
487 | Scope::ModuleScope(m) => { | 488 | Scope::ModuleScope(m) => { |
488 | // FIXME: should we provide `self` here? | 489 | // FIXME: should we provide `self` here? |
@@ -496,7 +497,9 @@ impl Scope { | |||
496 | f(name.clone(), ScopeDef::PerNs(def)); | 497 | f(name.clone(), ScopeDef::PerNs(def)); |
497 | }); | 498 | }); |
498 | m.crate_def_map[m.module_id].scope.legacy_macros().for_each(|(name, macro_)| { | 499 | m.crate_def_map[m.module_id].scope.legacy_macros().for_each(|(name, macro_)| { |
499 | f(name.clone(), ScopeDef::PerNs(PerNs::macros(macro_, Visibility::Public))); | 500 | let scope = PerNs::macros(macro_, Visibility::Public); |
501 | seen.insert((name.clone(), scope)); | ||
502 | f(name.clone(), ScopeDef::PerNs(scope)); | ||
500 | }); | 503 | }); |
501 | m.crate_def_map.extern_prelude.iter().for_each(|(name, &def)| { | 504 | m.crate_def_map.extern_prelude.iter().for_each(|(name, &def)| { |
502 | f(name.clone(), ScopeDef::PerNs(PerNs::types(def, Visibility::Public))); | 505 | f(name.clone(), ScopeDef::PerNs(PerNs::types(def, Visibility::Public))); |
@@ -507,7 +510,9 @@ impl Scope { | |||
507 | if let Some(prelude) = m.crate_def_map.prelude { | 510 | if let Some(prelude) = m.crate_def_map.prelude { |
508 | let prelude_def_map = db.crate_def_map(prelude.krate); | 511 | let prelude_def_map = db.crate_def_map(prelude.krate); |
509 | prelude_def_map[prelude.local_id].scope.entries().for_each(|(name, def)| { | 512 | prelude_def_map[prelude.local_id].scope.entries().for_each(|(name, def)| { |
510 | f(name.clone(), ScopeDef::PerNs(def)); | 513 | if !seen.contains(&(name.clone(), def)) { |
514 | f(name.clone(), ScopeDef::PerNs(def)); | ||
515 | } | ||
511 | }); | 516 | }); |
512 | } | 517 | } |
513 | } | 518 | } |