diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-09-17 22:16:28 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2019-09-17 22:16:28 +0100 |
commit | 54379ec6f8f82a470a275771e70825634d3d553b (patch) | |
tree | 498719aafe633f9eb9cb65ba65932076981e4632 /crates/ra_ide_api/src/hover.rs | |
parent | d505ee968b2a99eed65dfe7be27940ad9b2647c1 (diff) | |
parent | c2f9558e1af8dbf73ff86eeffcb9ea6940947dd6 (diff) |
Merge #1862
1862: Assoc item resolution refactoring (again) r=flodiebold a=flodiebold
This is #1849, with the associated type selection code removed for now. Handling cycles there will need some more thought.
Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates/ra_ide_api/src/hover.rs')
-rw-r--r-- | crates/ra_ide_api/src/hover.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_ide_api/src/hover.rs b/crates/ra_ide_api/src/hover.rs index 28a6bef12..655bcdb16 100644 --- a/crates/ra_ide_api/src/hover.rs +++ b/crates/ra_ide_api/src/hover.rs | |||
@@ -117,9 +117,9 @@ pub(crate) fn hover(db: &RootDatabase, position: FilePosition) -> Option<RangeIn | |||
117 | } | 117 | } |
118 | } | 118 | } |
119 | Some(AssocItem(it)) => res.extend(match it { | 119 | Some(AssocItem(it)) => res.extend(match it { |
120 | hir::ImplItem::Method(it) => from_def_source(db, it), | 120 | hir::AssocItem::Function(it) => from_def_source(db, it), |
121 | hir::ImplItem::Const(it) => from_def_source(db, it), | 121 | hir::AssocItem::Const(it) => from_def_source(db, it), |
122 | hir::ImplItem::TypeAlias(it) => from_def_source(db, it), | 122 | hir::AssocItem::TypeAlias(it) => from_def_source(db, it), |
123 | }), | 123 | }), |
124 | Some(Def(it)) => { | 124 | Some(Def(it)) => { |
125 | match it { | 125 | match it { |