diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-30 14:39:55 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-30 14:39:55 +0100 |
commit | 97fb5daf723c520b0361ade3e44f130257b1fe96 (patch) | |
tree | 82f372ea7b9560cf8fbf861203460fe2aa2d4c88 /crates/ra_hir_def/src/item_tree | |
parent | ee00679331b87dacc5fe608f153be160c1cb144c (diff) | |
parent | 28ef4c375a9f56d69daf885504aea3df7012bb81 (diff) |
Merge #5592
5592: Rename TypeParamList -> GenericParamList r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_def/src/item_tree')
-rw-r--r-- | crates/ra_hir_def/src/item_tree/lower.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir_def/src/item_tree/lower.rs b/crates/ra_hir_def/src/item_tree/lower.rs index 4cfc68f53..19d165b5b 100644 --- a/crates/ra_hir_def/src/item_tree/lower.rs +++ b/crates/ra_hir_def/src/item_tree/lower.rs | |||
@@ -568,10 +568,10 @@ impl Ctx { | |||
568 | fn lower_generic_params_and_inner_items( | 568 | fn lower_generic_params_and_inner_items( |
569 | &mut self, | 569 | &mut self, |
570 | owner: GenericsOwner<'_>, | 570 | owner: GenericsOwner<'_>, |
571 | node: &impl ast::TypeParamsOwner, | 571 | node: &impl ast::GenericParamsOwner, |
572 | ) -> GenericParamsId { | 572 | ) -> GenericParamsId { |
573 | // Generics are part of item headers and may contain inner items we need to collect. | 573 | // Generics are part of item headers and may contain inner items we need to collect. |
574 | if let Some(params) = node.type_param_list() { | 574 | if let Some(params) = node.generic_param_list() { |
575 | self.collect_inner_items(params.syntax()); | 575 | self.collect_inner_items(params.syntax()); |
576 | } | 576 | } |
577 | if let Some(clause) = node.where_clause() { | 577 | if let Some(clause) = node.where_clause() { |
@@ -584,7 +584,7 @@ impl Ctx { | |||
584 | fn lower_generic_params( | 584 | fn lower_generic_params( |
585 | &mut self, | 585 | &mut self, |
586 | owner: GenericsOwner<'_>, | 586 | owner: GenericsOwner<'_>, |
587 | node: &impl ast::TypeParamsOwner, | 587 | node: &impl ast::GenericParamsOwner, |
588 | ) -> GenericParamsId { | 588 | ) -> GenericParamsId { |
589 | let mut sm = &mut ArenaMap::default(); | 589 | let mut sm = &mut ArenaMap::default(); |
590 | let mut generics = GenericParams::default(); | 590 | let mut generics = GenericParams::default(); |