Skip to content

Commit 67e1f52

Browse files
borsbors
committed
Auto merge of #15086 - Veykril:import-intern, r=Veykril
internal: Intern use and extern crate items like other items Looking a bit into supporting use aliases and attributes better
2 parents 8eef452 + 9476fda commit 67e1f52

File tree

10 files changed

+123
-45
lines changed

10 files changed

+123
-45
lines changed

‎crates/hir-def/src/attr.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,7 @@ impl AttrsWithOwner {
462462
}
463463
},
464464
AttrDefId::ExternBlockId(it) => attrs_from_item_tree_loc(db, it),
465+
AttrDefId::ExternCrateId(it) => attrs_from_item_tree_loc(db, it),
465466
};
466467

467468
let attrs = raw_attrs.filter(db.upcast(), def.krate(db));
@@ -546,6 +547,7 @@ impl AttrsWithOwner {
546547
.map(|source| ast::AnyHasAttrs::new(source[id.local_id].clone())),
547548
},
548549
AttrDefId::ExternBlockId(id) => any_has_attrs(db, id),
550+
AttrDefId::ExternCrateId(id) => any_has_attrs(db, id),
549551
};
550552

551553
AttrSourceMap::new(owner.as_ref().map(|node| node as &dyn HasAttrs))

‎crates/hir-def/src/data.rs‎

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@ use crate::{
2424
proc_macro::{parse_macro_name_and_helper_attrs, ProcMacroKind},
2525
DefMap, MacroSubNs,
2626
},
27+
path::ImportAlias,
2728
type_ref::{TraitRef, TypeBound, TypeRef},
2829
visibility::RawVisibility,
29-
AssocItemId, AstIdWithPath, ConstId, ConstLoc, FunctionId, FunctionLoc, HasModule, ImplId,
30-
Intern, ItemContainerId, ItemLoc, Lookup, Macro2Id, MacroRulesId, ModuleId, ProcMacroId,
31-
StaticId, TraitAliasId, TraitId, TypeAliasId, TypeAliasLoc,
30+
AssocItemId, AstIdWithPath, ConstId, ConstLoc, ExternCrateId, FunctionId, FunctionLoc,
31+
HasModule, ImplId, Intern, ItemContainerId, ItemLoc, Lookup, Macro2Id, MacroRulesId, ModuleId,
32+
ProcMacroId, StaticId, TraitAliasId, TraitId, TypeAliasId, TypeAliasLoc,
3233
};
3334

3435
#[derive(Debug, Clone, PartialEq, Eq)]
@@ -424,6 +425,7 @@ impl MacroRulesData {
424425
Arc::new(MacroRulesData { name: makro.name.clone(), macro_export })
425426
}
426427
}
428+
427429
#[derive(Debug, Clone, PartialEq, Eq)]
428430
pub struct ProcMacroData {
429431
pub name: Name,
@@ -460,6 +462,30 @@ impl ProcMacroData {
460462
}
461463
}
462464

465+
#[derive(Debug, Clone, PartialEq, Eq)]
466+
pub struct ExternCrateDeclData {
467+
pub name: Name,
468+
pub alias: Option<ImportAlias>,
469+
pub visibility: RawVisibility,
470+
}
471+
472+
impl ExternCrateDeclData {
473+
pub(crate) fn extern_crate_decl_data_query(
474+
db: &dyn DefDatabase,
475+
extern_crate: ExternCrateId,
476+
) -> Arc<ExternCrateDeclData> {
477+
let loc = extern_crate.lookup(db);
478+
let item_tree = loc.id.item_tree(db);
479+
let extern_crate = &item_tree[loc.id.value];
480+
481+
Arc::new(Self {
482+
name: extern_crate.name.clone(),
483+
visibility: item_tree[extern_crate.visibility].clone(),
484+
alias: extern_crate.alias.clone(),
485+
})
486+
}
487+
}
488+
463489
#[derive(Debug, Clone, PartialEq, Eq)]
464490
pub struct ConstData {
465491
/// `None` for `const _: () = ();`

‎crates/hir-def/src/db.rs‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ use crate::{
1212
body::{scope::ExprScopes, Body, BodySourceMap},
1313
data::{
1414
adt::{EnumData, StructData},
15-
ConstData, FunctionData, ImplData, Macro2Data, MacroRulesData, ProcMacroData, StaticData,
16-
TraitAliasData, TraitData, TypeAliasData,
15+
ConstData, ExternCrateDeclData, FunctionData, ImplData, Macro2Data, MacroRulesData,
16+
ProcMacroData, StaticData, TraitAliasData, TraitData, TypeAliasData,
1717
},
1818
generics::GenericParams,
1919
import_map::ImportMap,
@@ -22,17 +22,21 @@ use crate::{
2222
nameres::{diagnostics::DefDiagnostic, DefMap},
2323
visibility::{self, Visibility},
2424
AttrDefId, BlockId, BlockLoc, ConstBlockId, ConstBlockLoc, ConstId, ConstLoc, DefWithBodyId,
25-
EnumId, EnumLoc, ExternBlockId, ExternBlockLoc, FunctionId, FunctionLoc, GenericDefId, ImplId,
26-
ImplLoc, InTypeConstId, InTypeConstLoc, LocalEnumVariantId, LocalFieldId, Macro2Id, Macro2Loc,
27-
MacroRulesId, MacroRulesLoc, ProcMacroId, ProcMacroLoc, StaticId, StaticLoc, StructId,
28-
StructLoc, TraitAliasId, TraitAliasLoc, TraitId, TraitLoc, TypeAliasId, TypeAliasLoc, UnionId,
29-
UnionLoc, VariantId,
25+
EnumId, EnumLoc, ExternBlockId, ExternBlockLoc, ExternCrateId, ExternCrateLoc, FunctionId,
26+
FunctionLoc, GenericDefId, ImplId, ImplLoc, ImportId, ImportLoc, InTypeConstId, InTypeConstLoc,
27+
LocalEnumVariantId, LocalFieldId, Macro2Id, Macro2Loc, MacroRulesId, MacroRulesLoc,
28+
ProcMacroId, ProcMacroLoc, StaticId, StaticLoc, StructId, StructLoc, TraitAliasId,
29+
TraitAliasLoc, TraitId, TraitLoc, TypeAliasId, TypeAliasLoc, UnionId, UnionLoc, VariantId,
3030
};
3131

3232
#[salsa::query_group(InternDatabaseStorage)]
3333
pub trait InternDatabase: SourceDatabase {
3434
// region: items
3535
#[salsa::interned]
36+
fn intern_import(&self, loc: ImportLoc) -> ImportId;
37+
#[salsa::interned]
38+
fn intern_extern_crate(&self, loc: ExternCrateLoc) -> ExternCrateId;
39+
#[salsa::interned]
3640
fn intern_function(&self, loc: FunctionLoc) -> FunctionId;
3741
#[salsa::interned]
3842
fn intern_struct(&self, loc: StructLoc) -> StructId;
@@ -160,6 +164,9 @@ pub trait DefDatabase: InternDatabase + ExpandDatabase + Upcast<dyn ExpandDataba
160164
#[salsa::invoke(ProcMacroData::proc_macro_data_query)]
161165
fn proc_macro_data(&self, makro: ProcMacroId) -> Arc<ProcMacroData>;
162166

167+
#[salsa::invoke(ExternCrateDeclData::extern_crate_decl_data_query)]
168+
fn extern_crate_decl_data(&self, extern_crate: ExternCrateId) -> Arc<ExternCrateDeclData>;
169+
163170
// endregion:data
164171

165172
#[salsa::invoke(Body::body_with_source_map_query)]

‎crates/hir-def/src/dyn_map/keys.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ use syntax::{ast, AstNode, AstPtr};
88

99
use crate::{
1010
dyn_map::{DynMap, Policy},
11-
ConstId, EnumId, EnumVariantId, FieldId, FunctionId, ImplId, LifetimeParamId, Macro2Id,
12-
MacroRulesId, ProcMacroId, StaticId, StructId, TraitAliasId, TraitId, TypeAliasId,
11+
ConstId, EnumId, EnumVariantId, ExternCrateId, FieldId, FunctionId, ImplId, LifetimeParamId,
12+
Macro2Id, MacroRulesId, ProcMacroId, StaticId, StructId, TraitAliasId, TraitId, TypeAliasId,
1313
TypeOrConstParamId, UnionId,
1414
};
1515

@@ -25,6 +25,7 @@ pub const TRAIT_ALIAS: Key<ast::TraitAlias, TraitAliasId> = Key::new();
2525
pub const STRUCT: Key<ast::Struct, StructId> = Key::new();
2626
pub const UNION: Key<ast::Union, UnionId> = Key::new();
2727
pub const ENUM: Key<ast::Enum, EnumId> = Key::new();
28+
pub const EXTERN_CRATE: Key<ast::ExternCrate, ExternCrateId> = Key::new();
2829

2930
pub const VARIANT: Key<ast::Variant, EnumVariantId> = Key::new();
3031
pub const TUPLE_FIELD: Key<ast::TupleField, FieldId> = Key::new();

‎crates/hir-def/src/item_scope.rs‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ use stdx::format_to;
1414
use syntax::ast;
1515

1616
use crate::{
17-
db::DefDatabase, per_ns::PerNs, visibility::Visibility, AdtId, BuiltinType, ConstId, HasModule,
18-
ImplId, LocalModuleId, MacroId, ModuleDefId, ModuleId, TraitId,
17+
db::DefDatabase, per_ns::PerNs, visibility::Visibility, AdtId, BuiltinType, ConstId,
18+
ExternCrateId, HasModule, ImplId, LocalModuleId, MacroId, ModuleDefId, ModuleId, TraitId,
1919
};
2020

2121
#[derive(Copy, Clone, Debug)]
@@ -50,6 +50,7 @@ pub struct ItemScope {
5050
unnamed_consts: Vec<ConstId>,
5151
/// Traits imported via `use Trait as _;`.
5252
unnamed_trait_imports: FxHashMap<TraitId, Visibility>,
53+
extern_crate_decls: Vec<ExternCrateId>,
5354
/// Macros visible in current module in legacy textual scope
5455
///
5556
/// For macros invoked by an unqualified identifier like `bar!()`, `legacy_macros` will be searched in first.
@@ -188,7 +189,11 @@ impl ItemScope {
188189
}
189190

190191
pub(crate) fn define_impl(&mut self, imp: ImplId) {
191-
self.impls.push(imp)
192+
self.impls.push(imp);
193+
}
194+
195+
pub(crate) fn define_extern_crate_decl(&mut self, extern_crate: ExternCrateId) {
196+
self.extern_crate_decls.push(extern_crate);
192197
}
193198

194199
pub(crate) fn define_unnamed_const(&mut self, konst: ConstId) {
@@ -397,6 +402,7 @@ impl ItemScope {
397402
legacy_macros,
398403
attr_macros,
399404
derive_macros,
405+
extern_crate_decls,
400406
} = self;
401407
types.shrink_to_fit();
402408
values.shrink_to_fit();
@@ -409,6 +415,7 @@ impl ItemScope {
409415
legacy_macros.shrink_to_fit();
410416
attr_macros.shrink_to_fit();
411417
derive_macros.shrink_to_fit();
418+
extern_crate_decls.shrink_to_fit();
412419
}
413420
}
414421

‎crates/hir-def/src/lib.rs‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ use crate::{
8888
builtin_type::BuiltinType,
8989
data::adt::VariantData,
9090
item_tree::{
91-
Const, Enum, Function, Impl, ItemTreeId, ItemTreeNode, MacroDef, MacroRules, Static,
92-
Struct, Trait, TraitAlias, TypeAlias, Union,
91+
Const, Enum, ExternCrate, Function, Impl, Import, ItemTreeId, ItemTreeNode, MacroDef,
92+
MacroRules, Static, Struct, Trait, TraitAlias, TypeAlias, Union,
9393
},
9494
};
9595

@@ -313,6 +313,16 @@ pub struct ImplId(salsa::InternId);
313313
type ImplLoc = ItemLoc<Impl>;
314314
impl_intern!(ImplId, ImplLoc, intern_impl, lookup_intern_impl);
315315

316+
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Ord, PartialOrd)]
317+
pub struct ImportId(salsa::InternId);
318+
type ImportLoc = ItemLoc<Import>;
319+
impl_intern!(ImportId, ImportLoc, intern_import, lookup_intern_import);
320+
321+
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Ord, PartialOrd)]
322+
pub struct ExternCrateId(salsa::InternId);
323+
type ExternCrateLoc = ItemLoc<ExternCrate>;
324+
impl_intern!(ExternCrateId, ExternCrateLoc, intern_extern_crate, lookup_intern_extern_crate);
325+
316326
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Ord, PartialOrd)]
317327
pub struct ExternBlockId(salsa::InternId);
318328
type ExternBlockLoc = ItemLoc<ExternBlock>;
@@ -821,6 +831,7 @@ pub enum AttrDefId {
821831
ImplId(ImplId),
822832
GenericParamId(GenericParamId),
823833
ExternBlockId(ExternBlockId),
834+
ExternCrateId(ExternCrateId),
824835
}
825836

826837
impl_from!(
@@ -835,7 +846,8 @@ impl_from!(
835846
TypeAliasId,
836847
MacroId(Macro2Id, MacroRulesId, ProcMacroId),
837848
ImplId,
838-
GenericParamId
849+
GenericParamId,
850+
ExternCrateId
839851
for AttrDefId
840852
);
841853

@@ -927,6 +939,12 @@ impl HasModule for AdtId {
927939
}
928940
}
929941

942+
impl HasModule for ExternCrateId {
943+
fn module(&self, db: &dyn db::DefDatabase) -> ModuleId {
944+
self.lookup(db).container
945+
}
946+
}
947+
930948
impl HasModule for VariantId {
931949
fn module(&self, db: &dyn db::DefDatabase) -> ModuleId {
932950
match self {
@@ -1050,6 +1068,7 @@ impl AttrDefId {
10501068
.krate
10511069
}
10521070
AttrDefId::MacroId(it) => it.module(db).krate,
1071+
AttrDefId::ExternCrateId(it) => it.lookup(db).container.krate,
10531072
}
10541073
}
10551074
}

‎crates/hir-def/src/nameres/collector.rs‎

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ use crate::{
5252
tt,
5353
visibility::{RawVisibility, Visibility},
5454
AdtId, AstId, AstIdWithPath, ConstLoc, CrateRootModuleId, EnumLoc, EnumVariantId,
55-
ExternBlockLoc, FunctionId, FunctionLoc, ImplLoc, Intern, ItemContainerId, LocalModuleId,
56-
Macro2Id, Macro2Loc, MacroExpander, MacroId, MacroRulesId, MacroRulesLoc, ModuleDefId,
57-
ModuleId, ProcMacroId, ProcMacroLoc, StaticLoc, StructLoc, TraitAliasLoc, TraitLoc,
58-
TypeAliasLoc, UnionLoc, UnresolvedMacro,
55+
ExternBlockLoc, ExternCrateLoc, FunctionId, FunctionLoc, ImplLoc, ImportLoc, Intern,
56+
ItemContainerId, LocalModuleId, Macro2Id, Macro2Loc, MacroExpander, MacroId, MacroRulesId,
57+
MacroRulesLoc, ModuleDefId, ModuleId, ProcMacroId, ProcMacroLoc, StaticLoc, StructLoc,
58+
TraitAliasLoc, TraitLoc, TypeAliasLoc, UnionLoc, UnresolvedMacro,
5959
};
6060

6161
static GLOB_RECURSION_LIMIT: Limit = Limit::new(100);
@@ -156,10 +156,9 @@ struct Import {
156156
alias: Option<ImportAlias>,
157157
visibility: RawVisibility,
158158
kind: ImportKind,
159+
source: ImportSource,
159160
is_prelude: bool,
160-
is_extern_crate: bool,
161161
is_macro_use: bool,
162-
source: ImportSource,
163162
}
164163

165164
impl Import {
@@ -168,26 +167,23 @@ impl Import {
168167
krate: CrateId,
169168
tree: &ItemTree,
170169
id: ItemTreeId<item_tree::Import>,
171-
) -> Vec<Self> {
170+
mut cb: impl FnMut(Self),
171+
) {
172172
let it = &tree[id.value];
173173
let attrs = &tree.attrs(db, krate, ModItem::from(id.value).into());
174174
let visibility = &tree[it.visibility];
175175
let is_prelude = attrs.by_key("prelude_import").exists();
176-
177-
let mut res = Vec::new();
178176
it.use_tree.expand(|idx, path, kind, alias| {
179-
res.push(Self {
177+
cb(Self {
180178
path,
181179
alias,
182180
visibility: visibility.clone(),
183181
kind,
184182
is_prelude,
185-
is_extern_crate: false,
186183
is_macro_use: false,
187184
source: ImportSource::Import { id, use_tree: idx },
188185
});
189186
});
190-
res
191187
}
192188

193189
fn from_extern_crate(
@@ -205,7 +201,6 @@ impl Import {
205201
visibility: visibility.clone(),
206202
kind: ImportKind::Plain,
207203
is_prelude: false,
208-
is_extern_crate: true,
209204
is_macro_use: attrs.by_key("macro_use").exists(),
210205
source: ImportSource::ExternCrate(id),
211206
}
@@ -776,7 +771,7 @@ impl DefCollector<'_> {
776771
let _p = profile::span("resolve_import")
777772
.detail(|| format!("{}", import.path.display(self.db.upcast())));
778773
tracing::debug!("resolving import: {:?} ({:?})", import, self.def_map.data.edition);
779-
if import.is_extern_crate {
774+
if matches!(import.source, ImportSource::ExternCrate { .. }) {
780775
let name = import
781776
.path
782777
.as_ident()
@@ -867,7 +862,7 @@ impl DefCollector<'_> {
867862
tracing::debug!("resolved import {:?} ({:?}) to {:?}", name, import, def);
868863

869864
// extern crates in the crate root are special-cased to insert entries into the extern prelude: rust-lang/rust#54658
870-
if import.is_extern_crate
865+
if matches!(import.source, ImportSource::ExternCrate { .. })
871866
&& self.def_map.block.is_none()
872867
&& module_id == DefMap::ROOT
873868
{
@@ -1585,21 +1580,34 @@ impl ModCollector<'_, '_> {
15851580
match item {
15861581
ModItem::Mod(m) => self.collect_module(m, &attrs),
15871582
ModItem::Import(import_id) => {
1588-
let imports = Import::from_use(
1583+
let _import_id = ImportLoc {
1584+
container: module,
1585+
id: ItemTreeId::new(self.tree_id, import_id),
1586+
}
1587+
.intern(db);
1588+
Import::from_use(
15891589
db,
15901590
krate,
15911591
self.item_tree,
15921592
ItemTreeId::new(self.tree_id, import_id),
1593-
);
1594-
self.def_collector.unresolved_imports.extend(imports.into_iter().map(
1595-
|import| ImportDirective {
1596-
module_id: self.module_id,
1597-
import,
1598-
status: PartialResolvedImport::Unresolved,
1593+
|import| {
1594+
self.def_collector.unresolved_imports.push(ImportDirective {
1595+
module_id: self.module_id,
1596+
import,
1597+
status: PartialResolvedImport::Unresolved,
1598+
});
15991599
},
1600-
));
1600+
)
16011601
}
16021602
ModItem::ExternCrate(import_id) => {
1603+
let extern_crate_id = ExternCrateLoc {
1604+
container: module,
1605+
id: ItemTreeId::new(self.tree_id, import_id),
1606+
}
1607+
.intern(db);
1608+
self.def_collector.def_map.modules[self.module_id]
1609+
.scope
1610+
.define_extern_crate_decl(extern_crate_id);
16031611
self.def_collector.unresolved_imports.push(ImportDirective {
16041612
module_id: self.module_id,
16051613
import: Import::from_extern_crate(

0 commit comments

Comments
 (0)