diff options
Diffstat (limited to 'crates/ra_hir/src/code_model_impl/module.rs')
-rw-r--r-- | crates/ra_hir/src/code_model_impl/module.rs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/crates/ra_hir/src/code_model_impl/module.rs b/crates/ra_hir/src/code_model_impl/module.rs index f487b8532..1425fa693 100644 --- a/crates/ra_hir/src/code_model_impl/module.rs +++ b/crates/ra_hir/src/code_model_impl/module.rs | |||
@@ -12,10 +12,7 @@ use crate::{ | |||
12 | 12 | ||
13 | impl Module { | 13 | impl Module { |
14 | fn with_module_id(&self, module_id: ModuleId) -> Module { | 14 | fn with_module_id(&self, module_id: ModuleId) -> Module { |
15 | Module { | 15 | Module { module_id, krate: self.krate } |
16 | module_id, | ||
17 | krate: self.krate, | ||
18 | } | ||
19 | } | 16 | } |
20 | 17 | ||
21 | pub(crate) fn name_impl(&self, db: &impl HirDatabase) -> Option<Name> { | 18 | pub(crate) fn name_impl(&self, db: &impl HirDatabase) -> Option<Name> { |
@@ -42,10 +39,7 @@ impl Module { | |||
42 | ) -> Option<(FileId, TreeArc<ast::Module>)> { | 39 | ) -> Option<(FileId, TreeArc<ast::Module>)> { |
43 | let module_tree = db.module_tree(self.krate); | 40 | let module_tree = db.module_tree(self.krate); |
44 | let link = self.module_id.parent_link(&module_tree)?; | 41 | let link = self.module_id.parent_link(&module_tree)?; |
45 | let file_id = link | 42 | let file_id = link.owner(&module_tree).file_id(&module_tree).as_original_file(); |
46 | .owner(&module_tree) | ||
47 | .file_id(&module_tree) | ||
48 | .as_original_file(); | ||
49 | let src = link.source(&module_tree, db); | 43 | let src = link.source(&module_tree, db); |
50 | Some((file_id, src)) | 44 | Some((file_id, src)) |
51 | } | 45 | } |