diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-02-14 20:26:08 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-02-14 20:26:08 +0000 |
| commit | 6fb36dfdcb91f67c28f51e51514ebe420ec3aa22 (patch) | |
| tree | 59e6238f5ebbaa017fd4d014b4de4f023b67352d /crates/ra_hir_def/src | |
| parent | 6711335173f138d444049357495fb2785c2bdd0b (diff) | |
| parent | 001dd6a2000ce4adada0ab6e4ed8fd67cb8eb569 (diff) | |
Merge #3145
3145: Make Self implement the trait inside trait default methods r=matklad a=flodiebold
Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates/ra_hir_def/src')
| -rw-r--r-- | crates/ra_hir_def/src/resolver.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/crates/ra_hir_def/src/resolver.rs b/crates/ra_hir_def/src/resolver.rs index 05cf4646a..e2b228e80 100644 --- a/crates/ra_hir_def/src/resolver.rs +++ b/crates/ra_hir_def/src/resolver.rs | |||
| @@ -542,11 +542,7 @@ impl Resolver { | |||
| 542 | 542 | ||
| 543 | fn push_generic_params_scope(self, db: &impl DefDatabase, def: GenericDefId) -> Resolver { | 543 | fn push_generic_params_scope(self, db: &impl DefDatabase, def: GenericDefId) -> Resolver { |
| 544 | let params = db.generic_params(def); | 544 | let params = db.generic_params(def); |
| 545 | if params.types.is_empty() { | 545 | self.push_scope(Scope::GenericParams { def, params }) |
| 546 | self | ||
| 547 | } else { | ||
| 548 | self.push_scope(Scope::GenericParams { def, params }) | ||
| 549 | } | ||
| 550 | } | 546 | } |
| 551 | 547 | ||
| 552 | fn push_impl_block_scope(self, impl_block: ImplId) -> Resolver { | 548 | fn push_impl_block_scope(self, impl_block: ImplId) -> Resolver { |