From 37ed2f35badfb41cd6c50ef04d6fd6a6ce67e0d1 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 1 Jan 2019 23:21:16 +0300 Subject: rename MFileId -> HirFileId --- crates/ra_hir/src/module/imp.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crates/ra_hir/src/module/imp.rs') diff --git a/crates/ra_hir/src/module/imp.rs b/crates/ra_hir/src/module/imp.rs index eded85a63..d1498a646 100644 --- a/crates/ra_hir/src/module/imp.rs +++ b/crates/ra_hir/src/module/imp.rs @@ -64,7 +64,7 @@ fn create_module_tree<'a>( let source_root = db.source_root(source_root); for &file_id in source_root.files.values() { - let source = ModuleSource::new_file(file_id); + let source = ModuleSource::new_file(file_id.into()); if visited.contains(&source) { continue; // TODO: use explicit crate_roots here } @@ -123,7 +123,7 @@ fn build_subtree( visited, roots, Some(link), - ModuleSource::new_file(file_id), + ModuleSource::new_file(file_id.into()), ), }) .collect::>>()?; @@ -155,7 +155,7 @@ fn resolve_submodule( name: &Name, ) -> (Vec, Option) { // FIXME: handle submodules of inline modules properly - let file_id = source.file_id(); + let file_id = source.file_id().original_file_id(db); let source_root_id = db.file_source_root(file_id); let path = db.file_relative_path(file_id); let root = RelativePathBuf::default(); -- cgit v1.2.3 From 1076e82856f353763de8426d378fcd1e371cbed4 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 2 Jan 2019 16:00:35 +0300 Subject: small rename --- crates/ra_hir/src/module/imp.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/ra_hir/src/module/imp.rs') diff --git a/crates/ra_hir/src/module/imp.rs b/crates/ra_hir/src/module/imp.rs index d1498a646..3849026db 100644 --- a/crates/ra_hir/src/module/imp.rs +++ b/crates/ra_hir/src/module/imp.rs @@ -155,7 +155,7 @@ fn resolve_submodule( name: &Name, ) -> (Vec, Option) { // FIXME: handle submodules of inline modules properly - let file_id = source.file_id().original_file_id(db); + let file_id = source.file_id().original_file(db); let source_root_id = db.file_source_root(file_id); let path = db.file_relative_path(file_id); let root = RelativePathBuf::default(); -- cgit v1.2.3