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_ide_api/src/completion/completion_item.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_ide_api/src/completion/completion_item.rs')
-rw-r--r-- | crates/ra_ide_api/src/completion/completion_item.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/crates/ra_ide_api/src/completion/completion_item.rs b/crates/ra_ide_api/src/completion/completion_item.rs index 3ba6c33ee..b2b047766 100644 --- a/crates/ra_ide_api/src/completion/completion_item.rs +++ b/crates/ra_ide_api/src/completion/completion_item.rs | |||
@@ -209,10 +209,7 @@ impl Builder { | |||
209 | ctx: &CompletionContext, | 209 | ctx: &CompletionContext, |
210 | resolution: &hir::Resolution, | 210 | resolution: &hir::Resolution, |
211 | ) -> Builder { | 211 | ) -> Builder { |
212 | let def = resolution | 212 | let def = resolution.def.take_types().or(resolution.def.take_values()); |
213 | .def_id | ||
214 | .take_types() | ||
215 | .or(resolution.def_id.take_values()); | ||
216 | let def = match def { | 213 | let def = match def { |
217 | None => return self, | 214 | None => return self, |
218 | Some(it) => it, | 215 | Some(it) => it, |