language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 06:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

simplify

Browse source
This commit is contained in:
Aleksey Kladov 2019-03-26 14:54:05 +03:00
parent 0b820cacab
commit f6f2d69bb8
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/ra_hir/src/source_binder.rs
View file

@ -13,7 +13,7 @@ use ra_syntax::{
};
use crate::{
HirDatabase, Function, Struct, Enum, SourceFileItemId,
HirDatabase, Function, Struct, Enum, SourceItemId,
AsName, Module, HirFileId, Crate, Trait, Resolver,
ids::LocationCtx,
expr
@ -55,7 +55,7 @@ fn module_from_inline(
assert!(!module.has_semi());
let file_id = file_id.into();
let file_items = db.file_items(file_id);
let item_id = file_items.id_of(file_id, module.syntax());
let item_id = file_items.id_of(file_id, module.syntax()).with_file_id(file_id);
module_from_source(db, file_id, Some(item_id))
}
@ -75,7 +75,7 @@ pub fn module_from_child_node(
fn module_from_source(
db: &impl HirDatabase,
file_id: HirFileId,
decl_id: Option<SourceFileItemId>,
decl_id: Option<SourceItemId>,
) -> Option<Module> {
let source_root_id = db.file_source_root(file_id.as_original_file());
db.source_root_crates(source_root_id).iter().map(|&crate_id| Crate { crate_id }).find_map(