Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide-assists/src/handlers/merge_match_arms.rs')
| -rw-r--r-- | crates/ide-assists/src/handlers/merge_match_arms.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ide-assists/src/handlers/merge_match_arms.rs b/crates/ide-assists/src/handlers/merge_match_arms.rs index 6e84af5f91..f41769150c 100644 --- a/crates/ide-assists/src/handlers/merge_match_arms.rs +++ b/crates/ide-assists/src/handlers/merge_match_arms.rs @@ -33,7 +33,7 @@ use crate::{AssistContext, AssistId, Assists, TextRange}; // } // } // ``` -pub(crate) fn merge_match_arms(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> { +pub(crate) fn merge_match_arms(acc: &mut Assists, ctx: &AssistContext<'_, '_>) -> Option<()> { let current_arm = ctx.find_node_at_trimmed_offset::<ast::MatchArm>()?; // Don't try to handle arms with guards for now - can add support for this later if current_arm.guard().is_some() { @@ -107,7 +107,7 @@ fn contains_placeholder(a: &ast::MatchArm) -> bool { fn are_same_types( current_arm_types: &FxHashMap<String, Option<Type<'_>>>, arm: &ast::MatchArm, - ctx: &AssistContext<'_>, + ctx: &AssistContext<'_, '_>, ) -> bool { let arm_types = get_arm_types(ctx, arm); for (other_arm_type_name, other_arm_type) in arm_types { @@ -122,14 +122,14 @@ fn are_same_types( } fn get_arm_types<'db>( - context: &AssistContext<'db>, + context: &AssistContext<'_, 'db>, arm: &ast::MatchArm, ) -> FxHashMap<String, Option<Type<'db>>> { let mut mapping: FxHashMap<String, Option<Type<'db>>> = FxHashMap::default(); fn recurse<'db>( map: &mut FxHashMap<String, Option<Type<'db>>>, - ctx: &AssistContext<'db>, + ctx: &AssistContext<'_, 'db>, pat: &Option<ast::Pat>, ) { if let Some(local_pat) = pat { |