rust-analyzer

diff --git a/crates/hir-def/src/db.rs b/crates/hir-def/src/db.rs
index 82e6dfb30c..e34a6768f2 100644
--- a/crates/hir-def/src/db.rs
+++ b/crates/hir-def/src/db.rs

@@ -23,17 +23,17 @@ use crate::{

visibility::{self, Visibility},

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

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,

+ 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, UseId, UseLoc, VariantId,

};

#[salsa::query_group(InternDatabaseStorage)]

pub trait InternDatabase: SourceDatabase {

// region: items

#[salsa::interned]

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

+ fn intern_use(&self, loc: UseLoc) -> UseId;

#[salsa::interned]

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

#[salsa::interned]

diff --git a/crates/hir-def/src/item_tree.rs b/crates/hir-def/src/item_tree.rs
index 6f80bb6e07..c9b0f75f1a 100644
--- a/crates/hir-def/src/item_tree.rs
+++ b/crates/hir-def/src/item_tree.rs

@@ -188,7 +188,7 @@ impl ItemTree {

fn shrink_to_fit(&mut self) {

if let Some(data) = &mut self.data {

let ItemTreeData {

- imports,

+ uses,

extern_crates,

extern_blocks,

functions,

@@ -211,7 +211,7 @@ impl ItemTree {

vis,

} = &mut **data;

- imports.shrink_to_fit();

+ uses.shrink_to_fit();

extern_crates.shrink_to_fit();

extern_blocks.shrink_to_fit();

functions.shrink_to_fit();

@@ -262,7 +262,7 @@ static VIS_PUB_CRATE: RawVisibility = RawVisibility::Module(ModPath::from_kind(P

#[derive(Default, Debug, Eq, PartialEq)]

struct ItemTreeData {

- imports: Arena<Import>,

+ uses: Arena<Use>,

extern_crates: Arena<ExternCrate>,

extern_blocks: Arena<ExternBlock>,

functions: Arena<Function>,

@@ -486,7 +486,7 @@ macro_rules! mod_items {

}

mod_items! {

- Import in imports -> ast::Use,

+ Use in uses -> ast::Use,

ExternCrate in extern_crates -> ast::ExternCrate,

ExternBlock in extern_blocks -> ast::ExternBlock,

Function in functions -> ast::Fn,

@@ -541,7 +541,7 @@ impl<N: ItemTreeNode> Index<FileItemTreeId<N>> for ItemTree {

}

#[derive(Debug, Clone, Eq, PartialEq)]

-pub struct Import {

+pub struct Use {

pub visibility: RawVisibilityId,

pub ast_id: FileAstId<ast::Use>,

pub use_tree: UseTree,

@@ -744,7 +744,7 @@ pub struct MacroDef {

pub ast_id: FileAstId<ast::MacroDef>,

}

-impl Import {

+impl Use {

/// Maps a `UseTree` contained in this import back to its AST node.

pub fn use_tree_to_ast(

&self,

@@ -870,7 +870,7 @@ macro_rules! impl_froms {

impl ModItem {

pub fn as_assoc_item(&self) -> Option<AssocItem> {

match self {

- ModItem::Import(_)

+ ModItem::Use(_)

| ModItem::ExternCrate(_)

| ModItem::ExternBlock(_)

| ModItem::Struct(_)

@@ -892,7 +892,7 @@ impl ModItem {

pub fn ast_id(&self, tree: &ItemTree) -> FileAstId<ast::Item> {

match self {

- ModItem::Import(it) => tree[it.index].ast_id().upcast(),

+ ModItem::Use(it) => tree[it.index].ast_id().upcast(),

ModItem::ExternCrate(it) => tree[it.index].ast_id().upcast(),

ModItem::ExternBlock(it) => tree[it.index].ast_id().upcast(),

ModItem::Function(it) => tree[it.index].ast_id().upcast(),

diff --git a/crates/hir-def/src/item_tree/lower.rs b/crates/hir-def/src/item_tree/lower.rs
index 46633667ed..7b898e62db 100644
--- a/crates/hir-def/src/item_tree/lower.rs
+++ b/crates/hir-def/src/item_tree/lower.rs

@@ -502,13 +502,13 @@ impl<'a> Ctx<'a> {

Some(id(self.data().impls.alloc(res)))

}

- fn lower_use(&mut self, use_item: &ast::Use) -> Option<FileItemTreeId<Import>> {

+ fn lower_use(&mut self, use_item: &ast::Use) -> Option<FileItemTreeId<Use>> {

let visibility = self.lower_visibility(use_item);

let ast_id = self.source_ast_id_map.ast_id(use_item);

let (use_tree, _) = lower_use_tree(self.db, self.hygiene(), use_item.use_tree()?)?;

- let res = Import { visibility, ast_id, use_tree };

- Some(id(self.data().imports.alloc(res)))

+ let res = Use { visibility, ast_id, use_tree };

+ Some(id(self.data().uses.alloc(res)))

}

fn lower_extern_crate(

diff --git a/crates/hir-def/src/item_tree/pretty.rs b/crates/hir-def/src/item_tree/pretty.rs
index ddf668d20b..da30830fe4 100644
--- a/crates/hir-def/src/item_tree/pretty.rs
+++ b/crates/hir-def/src/item_tree/pretty.rs

@@ -198,8 +198,8 @@ impl Printer<'_> {

self.print_attrs_of(item);

match item {

- ModItem::Import(it) => {

- let Import { visibility, use_tree, ast_id: _ } = &self.tree[it];

+ ModItem::Use(it) => {

+ let Use { visibility, use_tree, ast_id: _ } = &self.tree[it];

self.print_visibility(*visibility);

w!(self, "use ");

self.print_use_tree(use_tree);

diff --git a/crates/hir-def/src/lib.rs b/crates/hir-def/src/lib.rs
index 67fd5a3635..2f14378f67 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, ExternCrate, Function, Impl, Import, ItemTreeId, ItemTreeNode, MacroDef,

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

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

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

};

@@ -324,9 +324,9 @@ 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);

+pub struct UseId(salsa::InternId);

+type UseLoc = ItemLoc<Use>;

+impl_intern!(UseId, UseLoc, intern_use, lookup_intern_use);

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

pub struct ExternCrateId(salsa::InternId);

diff --git a/crates/hir-def/src/nameres/collector.rs b/crates/hir-def/src/nameres/collector.rs
index 61915504b6..eef54fc492 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, 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,

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

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

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

+ TraitLoc, TypeAliasLoc, UnionLoc, UnresolvedMacro, UseLoc,

};

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

@@ -146,7 +146,7 @@ impl PartialResolvedImport {

#[derive(Clone, Debug, Eq, PartialEq)]

enum ImportSource {

- Import { id: ItemTreeId<item_tree::Import>, use_tree: Idx<ast::UseTree> },

+ Use { id: ItemTreeId<item_tree::Use>, use_tree: Idx<ast::UseTree> },

ExternCrate(ItemTreeId<item_tree::ExternCrate>),

}

@@ -166,7 +166,7 @@ impl Import {

db: &dyn DefDatabase,

krate: CrateId,

tree: &ItemTree,

- id: ItemTreeId<item_tree::Import>,

+ id: ItemTreeId<item_tree::Use>,

mut cb: impl FnMut(Self),

) {

let it = &tree[id.value];

@@ -181,7 +181,7 @@ impl Import {

kind,

is_prelude,

is_macro_use: false,

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

+ source: ImportSource::Use { id, use_tree: idx },

});

}

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

}

for directive in &self.unresolved_imports {

- if let ImportSource::Import { id: import, use_tree } = directive.import.source {

+ if let ImportSource::Use { id: import, use_tree } = directive.import.source {

if matches!(

(directive.import.path.segments().first(), &directive.import.path.kind),

(Some(krate), PathKind::Plain | PathKind::Abs) if diagnosed_extern_crates.contains(krate)

@@ -1576,12 +1576,10 @@ impl ModCollector<'_, '_> {

match item {

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

- ModItem::Import(import_id) => {

- let _import_id = ImportLoc {

- container: module,

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

- }

- .intern(db);

+ ModItem::Use(import_id) => {

+ let _import_id =

+ UseLoc { container: module, id: ItemTreeId::new(self.tree_id, import_id) }

+ .intern(db);

Import::from_use(

db,

krate,

diff --git a/crates/hir-def/src/nameres/diagnostics.rs b/crates/hir-def/src/nameres/diagnostics.rs
index e82e97b628..9cffb3c9f3 100644
--- a/crates/hir-def/src/nameres/diagnostics.rs
+++ b/crates/hir-def/src/nameres/diagnostics.rs

@@ -19,7 +19,7 @@ pub enum DefDiagnosticKind {

UnresolvedExternCrate { ast: AstId<ast::ExternCrate> },

- UnresolvedImport { id: ItemTreeId<item_tree::Import>, index: Idx<ast::UseTree> },

+ UnresolvedImport { id: ItemTreeId<item_tree::Use>, index: Idx<ast::UseTree> },

UnconfiguredCode { ast: ErasedAstId, cfg: CfgExpr, opts: CfgOptions },

@@ -70,7 +70,7 @@ impl DefDiagnostic {

pub(super) fn unresolved_import(

container: LocalModuleId,

- id: ItemTreeId<item_tree::Import>,

+ id: ItemTreeId<item_tree::Use>,

index: Idx<ast::UseTree>,

) -> Self {

Self { in_module: container, kind: DefDiagnosticKind::UnresolvedImport { id, index } }