rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

kill module source

Browse Source
This commit is contained in:
Aleksey Kladov
2019-01-06 19:58:10 +03:00
parent cf0ce14351
commit 8a3b489c2f
8 changed files with 156 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/ra_hir/src/code_model_impl/krate.rs
View File

@@ -1,7 +1,7 @@
use ra_db::{CrateId, Cancelable};
use crate::{
HirFileId, Crate, CrateDependency, AsName, DefLoc, DefKind, Module,
HirFileId, Crate, CrateDependency, AsName, DefLoc, DefKind, Module, SourceItemId,
db::HirDatabase,
};
@@ -27,15 +27,17 @@ impl Crate {
let file_id = HirFileId::from(file_id);
let module_tree = db.module_tree(source_root_id)?;
// FIXME: teach module tree about crate roots instead of guessing
let (module_id, _) = ctry!(module_tree
.modules_with_sources()
.find(|(_, src)| src.file_id() == file_id));
let source = SourceItemId {
file_id,
item_id: None,
};
let module_id = ctry!(module_tree.find_module_by_source(source));
let def_loc = DefLoc {
kind: DefKind::Module,
source_root_id,
module_id,
source_item_id: module_id.source(&module_tree).0,
source_item_id: module_id.source(&module_tree),
};
let def_id = def_loc.id(db);

6
crates/ra_hir/src/code_model_impl/module.rs
View File

@@ -22,7 +22,7 @@ impl Module {
kind: DefKind::Module,
source_root_id,
module_id,
source_item_id: module_id.source(&module_tree).0,
source_item_id: module_id.source(&module_tree),
};
let def_id = def_loc.id(db);
let module = Module::new(def_id);
@@ -63,9 +63,9 @@ impl Module {
let file_id = link
.owner(&module_tree)
.source(&module_tree)
.file_id()
.file_id
.as_original_file();
let src = link.bind_source(&module_tree, db);
let src = link.source(&module_tree, db);
Ok(Some((file_id, src)))
}