From 8a3b489c2f57bdf8f6241e69276efa48b5ed4a98 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sun, 6 Jan 2019 19:58:10 +0300 Subject: kill module source --- crates/ra_hir/src/query_definitions.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'crates/ra_hir/src/query_definitions.rs') diff --git a/crates/ra_hir/src/query_definitions.rs b/crates/ra_hir/src/query_definitions.rs index f4b380022..8f2c40669 100644 --- a/crates/ra_hir/src/query_definitions.rs +++ b/crates/ra_hir/src/query_definitions.rs @@ -11,11 +11,11 @@ use ra_syntax::{ use ra_db::{SourceRootId, Cancelable,}; use crate::{ - SourceFileItems, SourceItemId, DefKind, DefId, HirFileId, + SourceFileItems, SourceItemId, DefKind, DefId, HirFileId, ModuleSource, MacroCallLoc, db::HirDatabase, function::FnScopes, - module_tree::{ModuleId, ModuleSourceNode}, + module_tree::ModuleId, nameres::{InputModuleItems, ItemMap, Resolver}, adt::{StructData, EnumData}, }; @@ -65,7 +65,8 @@ pub(super) fn input_module_items( ) -> Cancelable> { let module_tree = db.module_tree(source_root_id)?; let source = module_id.source(&module_tree); - let file_id = source.file_id(); + let file_id = source.file_id; + let source = ModuleSource::from_source_item_id(db, source); let file_items = db.file_items(file_id); let fill = |acc: &mut InputModuleItems, items: &mut Iterator| { for item in items { @@ -96,9 +97,9 @@ pub(super) fn input_module_items( }; let mut res = InputModuleItems::default(); - match source.resolve(db) { - ModuleSourceNode::SourceFile(it) => fill(&mut res, &mut it.borrowed().items_with_macros()), - ModuleSourceNode::Module(it) => { + match source { + ModuleSource::SourceFile(it) => fill(&mut res, &mut it.borrowed().items_with_macros()), + ModuleSource::Module(it) => { if let Some(item_list) = it.borrowed().item_list() { fill(&mut res, &mut item_list.items_with_macros()) } -- cgit v1.2.3