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_hir/src/source_binder.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_hir/src/source_binder.rs')
| -rw-r--r-- | crates/ra_hir/src/source_binder.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs index 2a907c9f1..4d895f0a1 100644 --- a/crates/ra_hir/src/source_binder.rs +++ b/crates/ra_hir/src/source_binder.rs | |||
| @@ -190,7 +190,7 @@ pub enum PathResolution { | |||
| 190 | GenericParam(u32), | 190 | GenericParam(u32), |
| 191 | SelfType(crate::ImplBlock), | 191 | SelfType(crate::ImplBlock), |
| 192 | Macro(MacroDef), | 192 | Macro(MacroDef), |
| 193 | AssocItem(crate::ImplItem), | 193 | AssocItem(crate::AssocItem), |
| 194 | } | 194 | } |
| 195 | 195 | ||
| 196 | #[derive(Debug, Clone, PartialEq, Eq)] | 196 | #[derive(Debug, Clone, PartialEq, Eq)] |