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

simiplify

Browse Source
This commit is contained in:
Aleksey Kladov 2019-01-23 17:57:41 +03:00
parent d853e9b1ef
commit 343852d8b2
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
crates/ra_hir/src/module_tree.rs
View File

@ -62,14 +62,26 @@ fn collect_submodules(
file_items: &SourceFileItems,
root: &impl ast::ModuleItemOwner,
) -> Vec<Submodule> {
modules(root)
.map(|(name, m)| Submodule {
name,
is_declaration: m.has_semi(),
source: SourceItemId {
file_id,
item_id: Some(file_items.id_of(file_id, m.syntax())),
},
root.items()
.filter_map(|item| match item.kind() {
ast::ModuleItemKind::Module(m) => Some(m),
_ => None,
})
.filter_map(|module| {
let name = module.name()?.as_name();
if !module.has_semi() && module.item_list().is_none() {
tested_by!(name_res_works_for_broken_modules);
return None;
}
let sub = Submodule {
name,
is_declaration: module.has_semi(),
source: SourceItemId {
file_id,
item_id: Some(file_items.id_of(file_id, module.syntax())),
},
};
Some(sub)
})
.collect()
}
@ -209,22 +221,6 @@ pub(crate) fn source(self, tree: &ModuleTree, db: &impl HirDatabase) -> TreeArc<
}
}
fn modules(root: &impl ast::ModuleItemOwner) -> impl Iterator<Item = (Name, &ast::Module)> {
root.items()
.filter_map(|item| match item.kind() {
ast::ModuleItemKind::Module(m) => Some(m),
_ => None,
})
.filter_map(|module| {
let name = module.name()?.as_name();
if !module.has_semi() && module.item_list().is_none() {
tested_by!(name_res_works_for_broken_modules);
return None;
}
Some((name, module))
})
}
fn create_module_tree<'a>(db: &impl HirDatabase, source_root: SourceRootId) -> ModuleTree {
let mut tree = ModuleTree::default();