mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary ItemTreeId field in ImportSource

Browse Source
This commit is contained in:
Lukas Wirth 2023-08-09 17:06:52 +02:00
parent c516dd51e9
commit 63aba76735
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
crates/hir-def/src/nameres/collector.rs
View File

@ -144,19 +144,10 @@ fn namespaces(self) -> PerNs {
} }
} }
// FIXME: `item_tree_id` can be derived from `id`, look into deduplicating this
#[derive(Clone, Debug, Eq, PartialEq)] #[derive(Clone, Debug, Eq, PartialEq)]
enum ImportSource { enum ImportSource {
Use { Use { use_tree: Idx<ast::UseTree>, id: UseId, is_prelude: bool },
item_tree_id: ItemTreeId<item_tree::Use>, ExternCrate { id: ExternCrateId },
use_tree: Idx<ast::UseTree>,
id: UseId,
is_prelude: bool,
},
ExternCrate {
item_tree_id: ItemTreeId<item_tree::ExternCrate>,
id: ExternCrateId,
},
} }
#[derive(Debug, Eq, PartialEq)] #[derive(Debug, Eq, PartialEq)]
@ -184,7 +175,7 @@ fn from_use(
alias, alias,
visibility: visibility.clone(), visibility: visibility.clone(),
kind, kind,
source: ImportSource::Use { item_tree_id, use_tree: idx, id, is_prelude }, source: ImportSource::Use { use_tree: idx, id, is_prelude },
}); });
}); });
} }
@ -201,7 +192,7 @@ fn from_extern_crate(
alias: it.alias.clone(), alias: it.alias.clone(),
visibility: visibility.clone(), visibility: visibility.clone(),
kind: ImportKind::Plain, kind: ImportKind::Plain,
source: ImportSource::ExternCrate { item_tree_id, id }, source: ImportSource::ExternCrate { id },
} }
} }
} }
@ -1469,7 +1460,8 @@ fn finish(mut self) -> DefMap {
// heuristic, but it works in practice. // heuristic, but it works in practice.
let mut diagnosed_extern_crates = FxHashSet::default(); let mut diagnosed_extern_crates = FxHashSet::default();
for directive in &self.unresolved_imports { for directive in &self.unresolved_imports {
if let ImportSource::ExternCrate { item_tree_id, id: _ } = directive.import.source { if let ImportSource::ExternCrate { id } = directive.import.source {
let item_tree_id = self.db.lookup_intern_extern_crate(id).id;
let item_tree = item_tree_id.item_tree(self.db); let item_tree = item_tree_id.item_tree(self.db);
let extern_crate = &item_tree[item_tree_id.value]; let extern_crate = &item_tree[item_tree_id.value];
@ -1483,16 +1475,14 @@ fn finish(mut self) -> DefMap {
} }
for directive in &self.unresolved_imports { for directive in &self.unresolved_imports {
if let ImportSource::Use { item_tree_id, use_tree, id: _, is_prelude: _ } = if let ImportSource::Use { use_tree, id, is_prelude: _ } = directive.import.source {
directive.import.source
{
if matches!( if matches!(
(directive.import.path.segments().first(), &directive.import.path.kind), (directive.import.path.segments().first(), &directive.import.path.kind),
(Some(krate), PathKind::Plain | PathKind::Abs) if diagnosed_extern_crates.contains(krate) (Some(krate), PathKind::Plain | PathKind::Abs) if diagnosed_extern_crates.contains(krate)
) { ) {
continue; continue;
} }
let item_tree_id = self.db.lookup_intern_use(id).id;
self.def_map.diagnostics.push(DefDiagnostic::unresolved_import( self.def_map.diagnostics.push(DefDiagnostic::unresolved_import(
directive.module_id, directive.module_id,
item_tree_id, item_tree_id,