aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_hir')
-rw-r--r--crates/ra_hir/src/ids.rs4
-rw-r--r--crates/ra_hir/src/module/imp.rs2
2 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir/src/ids.rs b/crates/ra_hir/src/ids.rs
index 6d59ef659..a09dee8b1 100644
--- a/crates/ra_hir/src/ids.rs
+++ b/crates/ra_hir/src/ids.rs
@@ -31,12 +31,12 @@ pub struct HirFileId(HirFileIdRepr);
31impl HirFileId { 31impl HirFileId {
32 /// For macro-expansion files, returns the file original source file the 32 /// For macro-expansion files, returns the file original source file the
33 /// expansionoriginated from. 33 /// expansionoriginated from.
34 pub(crate) fn original_file_id(self, db: &impl HirDatabase) -> FileId { 34 pub(crate) fn original_file(self, db: &impl HirDatabase) -> FileId {
35 match self.0 { 35 match self.0 {
36 HirFileIdRepr::File(file_id) => file_id, 36 HirFileIdRepr::File(file_id) => file_id,
37 HirFileIdRepr::Macro(macro_call_id) => { 37 HirFileIdRepr::Macro(macro_call_id) => {
38 let loc = macro_call_id.loc(db); 38 let loc = macro_call_id.loc(db);
39 loc.source_item_id.file_id.original_file_id(db) 39 loc.source_item_id.file_id.original_file(db)
40 } 40 }
41 } 41 }
42 } 42 }
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(
155 name: &Name, 155 name: &Name,
156) -> (Vec<FileId>, Option<Problem>) { 156) -> (Vec<FileId>, Option<Problem>) {
157 // FIXME: handle submodules of inline modules properly 157 // FIXME: handle submodules of inline modules properly
158 let file_id = source.file_id().original_file_id(db); 158 let file_id = source.file_id().original_file(db);
159 let source_root_id = db.file_source_root(file_id); 159 let source_root_id = db.file_source_root(file_id);
160 let path = db.file_relative_path(file_id); 160 let path = db.file_relative_path(file_id);
161 let root = RelativePathBuf::default(); 161 let root = RelativePathBuf::default();