Auto merge of #17277 - Veykril:find-path-fixes, r=Veykril · rust-lang/rust@ad810a5
11//! Name resolution façade.
2-use std::{fmt, hash::BuildHasherDefault, iter, mem};
2+use std::{fmt, iter, mem};
3344use base_db::CrateId;
55use hir_expand::{
66 name::{name, Name},
77MacroDefId,
88};
9-use indexmap::IndexMap;
109use intern::Interned;
1110use rustc_hash::FxHashSet;
1211use smallvec::{smallvec, SmallVec};
@@ -27,10 +26,10 @@ use crate::{
2726 type_ref::LifetimeRef,
2827 visibility::{RawVisibility, Visibility},
2928AdtId, ConstId, ConstParamId, CrateRootModuleId, DefWithBodyId, EnumId, EnumVariantId,
30-ExternBlockId, ExternCrateId, FunctionId, GenericDefId, GenericParamId, HasModule, ImplId,
31-ItemContainerId, ItemTreeLoc, LifetimeParamId, LocalModuleId, Lookup, Macro2Id, MacroId,
32-MacroRulesId, ModuleDefId, ModuleId, ProcMacroId, StaticId, StructId, TraitAliasId, TraitId,
33-TypeAliasId, TypeOrConstParamId, TypeOwnerId, TypeParamId, UseId, VariantId,
29+ExternBlockId, ExternCrateId, FunctionId, FxIndexMap, GenericDefId, GenericParamId, HasModule,
30+ImplId, ItemContainerId, ItemTreeLoc, LifetimeParamId, LocalModuleId, Lookup, Macro2Id,
31+MacroId, MacroRulesId, ModuleDefId, ModuleId, ProcMacroId, StaticId, StructId, TraitAliasId,
32+TraitId, TypeAliasId, TypeOrConstParamId, TypeOwnerId, TypeParamId, UseId, VariantId,
3433};
35343635#[derive(Debug, Clone)]
@@ -957,7 +956,6 @@ fn to_type_ns(per_ns: PerNs) -> Option<(TypeNs, Option<ImportOrExternCrate>)> {
957956Some((res, import))
958957}
959958960-type FxIndexMap<K, V> = IndexMap<K, V, BuildHasherDefault<rustc_hash::FxHasher>>;
961959#[derive(Default)]
962960struct ScopeNames {
963961map: FxIndexMap<Name, SmallVec<[ScopeDef; 1]>>,