diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-04-02 11:26:43 +0100 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-04-02 11:26:43 +0100 |
| commit | 2d680ff93aa30a52ffe40bb7d359e19565dca733 (patch) | |
| tree | 1b5fbd8228beb3d6ccd6b713c97e4c0d38783703 /crates/ra_hir/src/code_model_impl | |
| parent | bb3b159fb7d377f667732ade715cbe019da84d71 (diff) | |
| parent | 49f13d3a9bb5bf3ab92c3fbf23ad79cb001b76e0 (diff) | |
Merge #1089
1089: fix a panic with glob-import missing a source map r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/code_model_impl')
| -rw-r--r-- | crates/ra_hir/src/code_model_impl/module.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir/src/code_model_impl/module.rs b/crates/ra_hir/src/code_model_impl/module.rs index 0edb8ade5..ccca2b7e5 100644 --- a/crates/ra_hir/src/code_model_impl/module.rs +++ b/crates/ra_hir/src/code_model_impl/module.rs | |||
| @@ -72,7 +72,7 @@ impl Module { | |||
| 72 | &self, | 72 | &self, |
| 73 | db: &impl HirDatabase, | 73 | db: &impl HirDatabase, |
| 74 | import: ImportId, | 74 | import: ImportId, |
| 75 | ) -> TreeArc<ast::PathSegment> { | 75 | ) -> TreeArc<ast::UseTree> { |
| 76 | let (file_id, source) = self.definition_source(db); | 76 | let (file_id, source) = self.definition_source(db); |
| 77 | let (_, source_map) = db.raw_items_with_source_map(file_id); | 77 | let (_, source_map) = db.raw_items_with_source_map(file_id); |
| 78 | source_map.get(&source, import) | 78 | source_map.get(&source, import) |