rust-analyzer

diff --git a/crates/hir-def/src/db.rs b/crates/hir-def/src/db.rs
index 04ec47f84c..7c0eca1bb5 100644
--- a/crates/hir-def/src/db.rs
+++ b/crates/hir-def/src/db.rs

@@ -22,17 +22,21 @@ use crate::{

nameres::{diagnostics::DefDiagnostic, DefMap},

visibility::{self, Visibility},

AttrDefId, BlockId, BlockLoc, ConstBlockId, ConstBlockLoc, ConstId, ConstLoc, DefWithBodyId,

- EnumId, EnumLoc, ExternBlockId, ExternBlockLoc, FunctionId, FunctionLoc, GenericDefId, ImplId,

- ImplLoc, InTypeConstId, InTypeConstLoc, LocalEnumVariantId, LocalFieldId, Macro2Id, Macro2Loc,

- MacroRulesId, MacroRulesLoc, ProcMacroId, ProcMacroLoc, StaticId, StaticLoc, StructId,

- StructLoc, TraitAliasId, TraitAliasLoc, TraitId, TraitLoc, TypeAliasId, TypeAliasLoc, UnionId,

- UnionLoc, VariantId,

+ EnumId, EnumLoc, ExternBlockId, ExternBlockLoc, ExternCrateId, ExternCrateLoc, FunctionId,

+ FunctionLoc, GenericDefId, ImplId, ImplLoc, ImportId, ImportLoc, InTypeConstId, InTypeConstLoc,

+ LocalEnumVariantId, LocalFieldId, Macro2Id, Macro2Loc, MacroRulesId, MacroRulesLoc,

+ ProcMacroId, ProcMacroLoc, StaticId, StaticLoc, StructId, StructLoc, TraitAliasId,

+ TraitAliasLoc, TraitId, TraitLoc, TypeAliasId, TypeAliasLoc, UnionId, UnionLoc, VariantId,

};

#[salsa::query_group(InternDatabaseStorage)]

pub trait InternDatabase: SourceDatabase {

// region: items

#[salsa::interned]

+ fn intern_import(&self, loc: ImportLoc) -> ImportId;

+ #[salsa::interned]

+ fn intern_extern_crate(&self, loc: ExternCrateLoc) -> ExternCrateId;

+ #[salsa::interned]

fn intern_function(&self, loc: FunctionLoc) -> FunctionId;

#[salsa::interned]

fn intern_struct(&self, loc: StructLoc) -> StructId;

diff --git a/crates/hir-def/src/lib.rs b/crates/hir-def/src/lib.rs
index 9d8b57a0da..6c96af1e75 100644
--- a/crates/hir-def/src/lib.rs
+++ b/crates/hir-def/src/lib.rs

@@ -88,8 +88,8 @@ use crate::{

builtin_type::BuiltinType,

data::adt::VariantData,

item_tree::{

- Const, Enum, Function, Impl, ItemTreeId, ItemTreeNode, MacroDef, MacroRules, Static,

- Struct, Trait, TraitAlias, TypeAlias, Union,

+ Const, Enum, ExternCrate, Function, Impl, Import, ItemTreeId, ItemTreeNode, MacroDef,

+ MacroRules, Static, Struct, Trait, TraitAlias, TypeAlias, Union,

};

@@ -314,6 +314,16 @@ type ImplLoc = ItemLoc<Impl>;

impl_intern!(ImplId, ImplLoc, intern_impl, lookup_intern_impl);

#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Ord, PartialOrd)]

+pub struct ImportId(salsa::InternId);

+type ImportLoc = ItemLoc<Import>;

+impl_intern!(ImportId, ImportLoc, intern_import, lookup_intern_import);

+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Ord, PartialOrd)]

+pub struct ExternCrateId(salsa::InternId);

+type ExternCrateLoc = ItemLoc<ExternCrate>;

+impl_intern!(ExternCrateId, ExternCrateLoc, intern_extern_crate, lookup_intern_extern_crate);

+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Ord, PartialOrd)]

pub struct ExternBlockId(salsa::InternId);

type ExternBlockLoc = ItemLoc<ExternBlock>;

impl_intern!(ExternBlockId, ExternBlockLoc, intern_extern_block, lookup_intern_extern_block);

diff --git a/crates/hir-def/src/nameres/collector.rs b/crates/hir-def/src/nameres/collector.rs
index 62fb3c7882..3c0dfcf408 100644
--- a/crates/hir-def/src/nameres/collector.rs
+++ b/crates/hir-def/src/nameres/collector.rs

@@ -52,10 +52,10 @@ use crate::{

tt,

visibility::{RawVisibility, Visibility},

AdtId, AstId, AstIdWithPath, ConstLoc, CrateRootModuleId, EnumLoc, EnumVariantId,

- ExternBlockLoc, FunctionId, FunctionLoc, ImplLoc, Intern, ItemContainerId, LocalModuleId,

- Macro2Id, Macro2Loc, MacroExpander, MacroId, MacroRulesId, MacroRulesLoc, ModuleDefId,

- ModuleId, ProcMacroId, ProcMacroLoc, StaticLoc, StructLoc, TraitAliasLoc, TraitLoc,

- TypeAliasLoc, UnionLoc, UnresolvedMacro,

+ ExternBlockLoc, ExternCrateLoc, FunctionId, FunctionLoc, ImplLoc, ImportLoc, Intern,

+ ItemContainerId, LocalModuleId, Macro2Id, Macro2Loc, MacroExpander, MacroId, MacroRulesId,

+ MacroRulesLoc, ModuleDefId, ModuleId, ProcMacroId, ProcMacroLoc, StaticLoc, StructLoc,

+ TraitAliasLoc, TraitLoc, TypeAliasLoc, UnionLoc, UnresolvedMacro,

};

static GLOB_RECURSION_LIMIT: Limit = Limit::new(100);

@@ -156,10 +156,9 @@ struct Import {

alias: Option<ImportAlias>,

visibility: RawVisibility,

kind: ImportKind,

+ source: ImportSource,

is_prelude: bool,

- is_extern_crate: bool,

is_macro_use: bool,

- source: ImportSource,

}

impl Import {

@@ -168,26 +167,23 @@ impl Import {

krate: CrateId,

tree: &ItemTree,

id: ItemTreeId<item_tree::Import>,

- ) -> Vec<Self> {

+ mut cb: impl FnMut(Self),

+ ) {

let it = &tree[id.value];

let attrs = &tree.attrs(db, krate, ModItem::from(id.value).into());

let visibility = &tree[it.visibility];

let is_prelude = attrs.by_key("prelude_import").exists();

- let mut res = Vec::new();

it.use_tree.expand(|idx, path, kind, alias| {

- res.push(Self {

+ cb(Self {

path,

alias,

visibility: visibility.clone(),

kind,

is_prelude,

- is_extern_crate: false,

is_macro_use: false,

source: ImportSource::Import { id, use_tree: idx },

});

- res

}

fn from_extern_crate(

@@ -205,7 +201,6 @@ impl Import {

visibility: visibility.clone(),

kind: ImportKind::Plain,

is_prelude: false,

- is_extern_crate: true,

is_macro_use: attrs.by_key("macro_use").exists(),

source: ImportSource::ExternCrate(id),

}

@@ -776,7 +771,7 @@ impl DefCollector<'_> {

let _p = profile::span("resolve_import")

.detail(|| format!("{}", import.path.display(self.db.upcast())));

tracing::debug!("resolving import: {:?} ({:?})", import, self.def_map.data.edition);

- if import.is_extern_crate {

+ if matches!(import.source, ImportSource::ExternCrate { .. }) {

let name = import

.path

.as_ident()

@@ -867,7 +862,7 @@ impl DefCollector<'_> {

tracing::debug!("resolved import {:?} ({:?}) to {:?}", name, import, def);

// extern crates in the crate root are special-cased to insert entries into the extern prelude: rust-lang/rust#54658

- if import.is_extern_crate

+ if matches!(import.source, ImportSource::ExternCrate { .. })

&& self.def_map.block.is_none()

&& module_id == DefMap::ROOT

{

@@ -1585,21 +1580,31 @@ impl ModCollector<'_, '_> {

match item {

ModItem::Mod(m) => self.collect_module(m, &attrs),

ModItem::Import(import_id) => {

- let imports = Import::from_use(

+ let _import_id = ImportLoc {

+ container: module,

+ id: ItemTreeId::new(self.tree_id, import_id),

+ }

+ .intern(db);

+ Import::from_use(

db,

krate,

self.item_tree,

ItemTreeId::new(self.tree_id, import_id),

- );

- self.def_collector.unresolved_imports.extend(imports.into_iter().map(

- |import| ImportDirective {

- module_id: self.module_id,

- import,

- status: PartialResolvedImport::Unresolved,

+ |import| {

+ self.def_collector.unresolved_imports.push(ImportDirective {

+ module_id: self.module_id,

+ import,

+ status: PartialResolvedImport::Unresolved,

+ });

- ));

+ )

}

ModItem::ExternCrate(import_id) => {

+ let _import_id = ExternCrateLoc {

+ container: module,

+ id: ItemTreeId::new(self.tree_id, import_id),

+ }

+ .intern(db);

self.def_collector.unresolved_imports.push(ImportDirective {

module_id: self.module_id,

import: Import::from_extern_crate(