diff options
Diffstat (limited to 'crates/ra_hir/src/code_model')
-rw-r--r-- | crates/ra_hir/src/code_model/src.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crates/ra_hir/src/code_model/src.rs b/crates/ra_hir/src/code_model/src.rs index fdae26906..8b33f25f7 100644 --- a/crates/ra_hir/src/code_model/src.rs +++ b/crates/ra_hir/src/code_model/src.rs | |||
@@ -37,9 +37,9 @@ impl<T> Source<T> { | |||
37 | impl Module { | 37 | impl Module { |
38 | /// Returns a node which defines this module. That is, a file or a `mod foo {}` with items. | 38 | /// Returns a node which defines this module. That is, a file or a `mod foo {}` with items. |
39 | pub fn definition_source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<ModuleSource> { | 39 | pub fn definition_source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<ModuleSource> { |
40 | let def_map = db.crate_def_map(self.krate); | 40 | let def_map = db.crate_def_map(self.krate()); |
41 | let decl_id = def_map[self.module_id].declaration; | 41 | let decl_id = def_map[self.id.module_id].declaration; |
42 | let file_id = def_map[self.module_id].definition; | 42 | let file_id = def_map[self.id.module_id].definition; |
43 | let ast = ModuleSource::new(db, file_id, decl_id); | 43 | let ast = ModuleSource::new(db, file_id, decl_id); |
44 | let file_id = file_id.map(HirFileId::from).unwrap_or_else(|| decl_id.unwrap().file_id()); | 44 | let file_id = file_id.map(HirFileId::from).unwrap_or_else(|| decl_id.unwrap().file_id()); |
45 | Source { file_id, ast } | 45 | Source { file_id, ast } |
@@ -51,8 +51,8 @@ impl Module { | |||
51 | self, | 51 | self, |
52 | db: &(impl DefDatabase + AstDatabase), | 52 | db: &(impl DefDatabase + AstDatabase), |
53 | ) -> Option<Source<ast::Module>> { | 53 | ) -> Option<Source<ast::Module>> { |
54 | let def_map = db.crate_def_map(self.krate); | 54 | let def_map = db.crate_def_map(self.krate()); |
55 | let decl = def_map[self.module_id].declaration?; | 55 | let decl = def_map[self.id.module_id].declaration?; |
56 | let ast = decl.to_node(db); | 56 | let ast = decl.to_node(db); |
57 | Some(Source { file_id: decl.file_id(), ast }) | 57 | Some(Source { file_id: decl.file_id(), ast }) |
58 | } | 58 | } |