diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-10-08 12:46:14 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-10-08 12:46:14 +0100 |
| commit | 92cf0eba93b8d2705ed39bef1a4ea665ed3c25dc (patch) | |
| tree | a015a8a8162acacb61b3353b4642c93cd80e51ae /crates/ra_hir/src/ty/lower.rs | |
| parent | 93199002af05f3a3dfd274fe10633372f2471b73 (diff) | |
| parent | b043358be936b7f139efd49b7d187d64e319830e (diff) | |
Merge #1924
1924: Support inferring&completing `Self` type in enum/struct/union definitions r=ice1000 a=ice1000
Signed-off-by: ice1000 <[email protected]>
An attempt to fix #1908.
This code works, but I believe the implementation is ugly. Please give me suggestions!
Co-authored-by: ice1000 <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/ty/lower.rs')
| -rw-r--r-- | crates/ra_hir/src/ty/lower.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crates/ra_hir/src/ty/lower.rs b/crates/ra_hir/src/ty/lower.rs index 4b67c82e7..a604c02e2 100644 --- a/crates/ra_hir/src/ty/lower.rs +++ b/crates/ra_hir/src/ty/lower.rs | |||
| @@ -175,6 +175,7 @@ impl Ty { | |||
| 175 | Ty::Param { idx, name } | 175 | Ty::Param { idx, name } |
| 176 | } | 176 | } |
| 177 | TypeNs::SelfType(impl_block) => impl_block.target_ty(db), | 177 | TypeNs::SelfType(impl_block) => impl_block.target_ty(db), |
| 178 | TypeNs::AdtSelfType(adt) => adt.ty(db), | ||
| 178 | 179 | ||
| 179 | TypeNs::Adt(it) => Ty::from_hir_path_inner(db, resolver, resolved_segment, it.into()), | 180 | TypeNs::Adt(it) => Ty::from_hir_path_inner(db, resolver, resolved_segment, it.into()), |
| 180 | TypeNs::BuiltinType(it) => { | 181 | TypeNs::BuiltinType(it) => { |