diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-25 07:32:13 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-25 07:32:13 +0000 |
| commit | 946aea3eb34d1b7f09900e017bb94708e6299d0a (patch) | |
| tree | a662d8e9c63835950af45792dd538ce7d30b9251 /crates/ra_hir/src/code_model_api.rs | |
| parent | 675943712ce92e0ce04e85e6952f50bcbf1ee611 (diff) | |
| parent | 0707f65806961028f2be64812869c66020e2a1a6 (diff) | |
Merge #634
634: rename def_id -> def r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/code_model_api.rs')
| -rw-r--r-- | crates/ra_hir/src/code_model_api.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/code_model_api.rs b/crates/ra_hir/src/code_model_api.rs index 6739627b4..a469ad477 100644 --- a/crates/ra_hir/src/code_model_api.rs +++ b/crates/ra_hir/src/code_model_api.rs | |||
| @@ -165,11 +165,11 @@ impl Module { | |||
| 165 | 165 | ||
| 166 | /// Returns a `ModuleScope`: a set of items, visible in this module. | 166 | /// Returns a `ModuleScope`: a set of items, visible in this module. |
| 167 | pub fn scope(&self, db: &impl HirDatabase) -> ModuleScope { | 167 | pub fn scope(&self, db: &impl HirDatabase) -> ModuleScope { |
| 168 | self.scope_impl(db) | 168 | db.item_map(self.krate)[self.module_id].clone() |
| 169 | } | 169 | } |
| 170 | 170 | ||
| 171 | pub fn resolve_path(&self, db: &impl HirDatabase, path: &Path) -> PerNs<ModuleDef> { | 171 | pub fn resolve_path(&self, db: &impl HirDatabase, path: &Path) -> PerNs<ModuleDef> { |
| 172 | self.resolve_path_impl(db, path) | 172 | db.item_map(self.krate).resolve_path(db, *self, path) |
| 173 | } | 173 | } |
| 174 | 174 | ||
| 175 | pub fn problems(&self, db: &impl HirDatabase) -> Vec<(TreeArc<SyntaxNode>, Problem)> { | 175 | pub fn problems(&self, db: &impl HirDatabase) -> Vec<(TreeArc<SyntaxNode>, Problem)> { |