From: Jeroen Vannevel Date: Wed, 5 Jan 2022 21:16:24 +0000 (+0000) Subject: removed double matching X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=035a373a6a025bd9b2f115adbe0884861ca2a9e4;p=rust.git removed double matching --- diff --git a/crates/ide_assists/src/handlers/extract_variable.rs b/crates/ide_assists/src/handlers/extract_variable.rs index 3cfd407b76a..aaed2b67fe8 100644 --- a/crates/ide_assists/src/handlers/extract_variable.rs +++ b/crates/ide_assists/src/handlers/extract_variable.rs @@ -52,10 +52,10 @@ pub(crate) fn extract_variable(acc: &mut Assists, ctx: &AssistContext) -> Option } } - let ref_kind = match get_receiver_type(&ctx, &to_extract) { - Some(receiver_type) if receiver_type.is_mutable_reference() => RefKind::MutRef, - Some(receiver_type) if receiver_type.is_reference() => RefKind::Ref, - _ => RefKind::None, + let reference_modifier = match get_receiver_type(&ctx, &to_extract) { + Some(receiver_type) if receiver_type.is_mutable_reference() => "&mut ", + Some(receiver_type) if receiver_type.is_reference() => "&", + _ => "", }; let anchor = Anchor::from(&to_extract)?; @@ -83,12 +83,6 @@ pub(crate) fn extract_variable(acc: &mut Assists, ctx: &AssistContext) -> Option None => to_extract.syntax().text_range(), }; - let reference_modifier = match ref_kind { - RefKind::MutRef => "&mut ", - RefKind::Ref => "&", - RefKind::None => "", - }; - match anchor { Anchor::Before(_) | Anchor::Replace(_) => { format_to!(buf, "let {} = {}", var_name, reference_modifier) @@ -176,13 +170,6 @@ fn get_receiver(expression: ast::Expr) -> Option { } } -#[derive(Debug)] -enum RefKind { - Ref, - MutRef, - None, -} - #[derive(Debug)] enum Anchor { Before(SyntaxNode),