diff options
Diffstat (limited to 'crates/ra_hir/src/code_model_api.rs')
-rw-r--r-- | crates/ra_hir/src/code_model_api.rs | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/crates/ra_hir/src/code_model_api.rs b/crates/ra_hir/src/code_model_api.rs index fb7ad0867..99f004905 100644 --- a/crates/ra_hir/src/code_model_api.rs +++ b/crates/ra_hir/src/code_model_api.rs | |||
@@ -1,7 +1,7 @@ | |||
1 | use std::sync::Arc; | 1 | use std::sync::Arc; |
2 | 2 | ||
3 | use relative_path::RelativePathBuf; | 3 | use relative_path::RelativePathBuf; |
4 | use ra_db::{CrateId, FileId, SourceRootId, Edition}; | 4 | use ra_db::{CrateId, SourceRootId, Edition}; |
5 | use ra_syntax::{ast::self, TreeArc, SyntaxNode}; | 5 | use ra_syntax::{ast::self, TreeArc, SyntaxNode}; |
6 | 6 | ||
7 | use crate::{ | 7 | use crate::{ |
@@ -16,7 +16,7 @@ use crate::{ | |||
16 | docs::{Documentation, Docs, docs_from_ast}, | 16 | docs::{Documentation, Docs, docs_from_ast}, |
17 | module_tree::ModuleId, | 17 | module_tree::ModuleId, |
18 | ids::{FunctionId, StructId, EnumId, AstItemDef, ConstId, StaticId, TraitId, TypeId}, | 18 | ids::{FunctionId, StructId, EnumId, AstItemDef, ConstId, StaticId, TraitId, TypeId}, |
19 | impl_block::{ImplId, ImplBlock}, | 19 | impl_block::ImplBlock, |
20 | resolve::Resolver, | 20 | resolve::Resolver, |
21 | }; | 21 | }; |
22 | 22 | ||
@@ -107,7 +107,7 @@ impl Module { | |||
107 | } | 107 | } |
108 | 108 | ||
109 | /// Returns a node which defines this module. That is, a file or a `mod foo {}` with items. | 109 | /// Returns a node which defines this module. That is, a file or a `mod foo {}` with items. |
110 | pub fn definition_source(&self, db: &impl PersistentHirDatabase) -> (FileId, ModuleSource) { | 110 | pub fn definition_source(&self, db: &impl PersistentHirDatabase) -> (HirFileId, ModuleSource) { |
111 | self.definition_source_impl(db) | 111 | self.definition_source_impl(db) |
112 | } | 112 | } |
113 | 113 | ||
@@ -116,7 +116,7 @@ impl Module { | |||
116 | pub fn declaration_source( | 116 | pub fn declaration_source( |
117 | &self, | 117 | &self, |
118 | db: &impl HirDatabase, | 118 | db: &impl HirDatabase, |
119 | ) -> Option<(FileId, TreeArc<ast::Module>)> { | 119 | ) -> Option<(HirFileId, TreeArc<ast::Module>)> { |
120 | self.declaration_source_impl(db) | 120 | self.declaration_source_impl(db) |
121 | } | 121 | } |
122 | 122 | ||
@@ -129,11 +129,6 @@ impl Module { | |||
129 | self.import_source_impl(db, import) | 129 | self.import_source_impl(db, import) |
130 | } | 130 | } |
131 | 131 | ||
132 | /// Returns the syntax of the impl block in this module | ||
133 | pub fn impl_source(&self, db: &impl HirDatabase, impl_id: ImplId) -> TreeArc<ast::ImplBlock> { | ||
134 | self.impl_source_impl(db, impl_id) | ||
135 | } | ||
136 | |||
137 | /// Returns the crate this module is part of. | 132 | /// Returns the crate this module is part of. |
138 | pub fn krate(&self, _db: &impl PersistentHirDatabase) -> Option<Crate> { | 133 | pub fn krate(&self, _db: &impl PersistentHirDatabase) -> Option<Crate> { |
139 | Some(self.krate) | 134 | Some(self.krate) |
@@ -202,7 +197,7 @@ impl Module { | |||
202 | module_impl_blocks | 197 | module_impl_blocks |
203 | .impls | 198 | .impls |
204 | .iter() | 199 | .iter() |
205 | .map(|(impl_id, _)| ImplBlock::from_id(module_impl_blocks.clone(), impl_id)) | 200 | .map(|(impl_id, _)| ImplBlock::from_id(self, impl_id)) |
206 | .collect() | 201 | .collect() |
207 | } | 202 | } |
208 | } | 203 | } |