diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 15:50:47 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 15:50:47 +0000 |
| commit | 7c977a7dcd2bac3b6148f2428bcb586c6354d775 (patch) | |
| tree | 6ea2db9840f91aa39b65680ace9d3079a140a12c /crates/ra_ide_api/src/completion/completion_item.rs | |
| parent | 05149d353299b54476410daeda6551e1261128ef (diff) | |
| parent | f1367e0370d5de5cba13c853c7df5f0c5a0edf59 (diff) | |
Merge #552
552: remove Cancelable from navigation target r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide_api/src/completion/completion_item.rs')
| -rw-r--r-- | crates/ra_ide_api/src/completion/completion_item.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_ide_api/src/completion/completion_item.rs b/crates/ra_ide_api/src/completion/completion_item.rs index b75d65de3..11d00f78c 100644 --- a/crates/ra_ide_api/src/completion/completion_item.rs +++ b/crates/ra_ide_api/src/completion/completion_item.rs | |||
| @@ -144,7 +144,7 @@ impl Builder { | |||
| 144 | ctx: &CompletionContext, | 144 | ctx: &CompletionContext, |
| 145 | resolution: &hir::Resolution, | 145 | resolution: &hir::Resolution, |
| 146 | ) -> Builder { | 146 | ) -> Builder { |
| 147 | let resolved = resolution.def_id.and_then(|d| d.resolve(ctx.db).ok()); | 147 | let resolved = resolution.def_id.map(|d| d.resolve(ctx.db)); |
| 148 | let kind = match resolved { | 148 | let kind = match resolved { |
| 149 | PerNs { | 149 | PerNs { |
| 150 | types: Some(hir::Def::Module(..)), | 150 | types: Some(hir::Def::Module(..)), |