From 2e4a4f1a9c1cba63ec44562f0ab0d5b5783ad561 Mon Sep 17 00:00:00 2001
From: Dorian Scheidt <dorian.scheidt@gmail.com>
Date: Thu, 18 Aug 2022 18:28:43 -0500
Subject: [PATCH] Cleanup inline

---
 .../src/handlers/generate_function.rs         | 25 +++++++------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/crates/ide-assists/src/handlers/generate_function.rs b/crates/ide-assists/src/handlers/generate_function.rs
index 6c045a3333d..cf28f49e034 100644
--- a/crates/ide-assists/src/handlers/generate_function.rs
+++ b/crates/ide-assists/src/handlers/generate_function.rs
@@ -418,22 +418,15 @@ fn assoc_fn_target_info(
     adt: hir::Adt,
     fn_name: &str,
 ) -> Option<TargetInfo> {
-    let mut target_module = None;
-    let mut adt_name = None;
-    let (target, file, insert_offset) = {
-        let target_module: &mut Option<Module> = &mut target_module;
-        let adt_name: &mut Option<hir::Name> = &mut adt_name;
-        let current_module = ctx.sema.scope(call.syntax())?.module();
-        let module = adt.module(ctx.sema.db);
-        *target_module = if current_module == module { None } else { Some(module) };
-        if current_module.krate() != module.krate() {
-            return None;
-        }
-        let (impl_, file) = get_adt_source(ctx, &adt, fn_name)?;
-        let (target, insert_offset) = get_method_target(ctx, &module, &impl_)?;
-        *adt_name = if impl_.is_none() { Some(adt.name(ctx.sema.db)) } else { None };
-        Some((target, file, insert_offset))
-    }?;
+    let current_module = ctx.sema.scope(call.syntax())?.module();
+    let module = adt.module(ctx.sema.db);
+    let target_module = if current_module == module { None } else { Some(module) };
+    if current_module.krate() != module.krate() {
+        return None;
+    }
+    let (impl_, file) = get_adt_source(ctx, &adt, fn_name)?;
+    let (target, insert_offset) = get_method_target(ctx, &module, &impl_)?;
+    let adt_name = if impl_.is_none() { Some(adt.name(ctx.sema.db)) } else { None };
     Some(TargetInfo { target_module, adt_name, target, file, insert_offset })
 }