clean-up a bit

Author: ada4a

clippy_lints/src/entry.rs

@@ -6,14 +6,15 @@ use clippy_utils::{
     SpanlessEq, can_move_expr_to_closure_no_visit, higher, is_expr_final_block_expr, is_expr_used_or_unified,
     peel_hir_expr_while,
 };
-use core::fmt::{self, Write};
+use core::fmt::Write;
 use rustc_errors::Applicability;
 use rustc_hir::hir_id::HirIdSet;
 use rustc_hir::intravisit::{Visitor, walk_body, walk_expr};
 use rustc_hir::{Block, Expr, ExprKind, HirId, Pat, Stmt, StmtKind, UnOp};
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_session::declare_lint_pass;
 use rustc_span::{DUMMY_SP, Span, SyntaxContext, sym};
+use std::fmt;
 use std::ops::ControlFlow;
 
 declare_clippy_lint! {
@@ -628,11 +629,8 @@ impl<'tcx> InsertSearchResults<'tcx> {
             if is_expr_used_or_unified(cx.tcx, insertion.call) {
                 write_wrapped(&mut res, insertion, ctxt, app);
             } else {
-                let _: fmt::Result = write!(
-                    res,
-                    "e.insert({})",
-                    snippet_with_context(cx, insertion.value.span, ctxt, "..", app).0
-                );
+                let value_str = snippet_with_context(cx, insertion.value.span, ctxt, "..", app).0;
+                let _: fmt::Result = write!(res, "e.insert({value_str})");
             }
             span = span.trim_start(insertion.call.span).unwrap_or(DUMMY_SP);
         }
@@ -644,11 +642,8 @@ impl<'tcx> InsertSearchResults<'tcx> {
         (
             self.snippet(cx, span, app, |res, insertion, ctxt, app| {
                 // Insertion into a map would return `Some(&mut value)`, but the entry returns `&mut value`
-                let _: fmt::Result = write!(
-                    res,
-                    "Some(e.insert({}))",
-                    snippet_with_context(cx, insertion.value.span, ctxt, "..", app).0
-                );
+                let value_str = snippet_with_context(cx, insertion.value.span, ctxt, "..", app).0;
+                let _: fmt::Result = write!(res, "Some(e.insert({value_str}))");
             }),
             "Occupied(mut e)",
         )
@@ -658,19 +653,15 @@ impl<'tcx> InsertSearchResults<'tcx> {
         (
             self.snippet(cx, span, app, |res, insertion, ctxt, app| {
                 // Insertion into a map would return `None`, but the entry returns a mutable reference.
+                let value_str = snippet_with_context(cx, insertion.value.span, ctxt, "..", app).0;
                 let _: fmt::Result = if is_expr_final_block_expr(cx.tcx, insertion.call) {
                     write!(
                         res,
-                        "e.insert({});\n{}None",
-                        snippet_with_context(cx, insertion.value.span, ctxt, "..", app).0,
-                        snippet_indent(cx, insertion.call.span).as_deref().unwrap_or(""),
+                        "e.insert({value_str});\n{indent}None",
+                        indent = snippet_indent(cx, insertion.call.span).as_deref().unwrap_or(""),
                     )
                 } else {
-                    write!(
-                        res,
-                        "{{ e.insert({}); None }}",
-                        snippet_with_context(cx, insertion.value.span, ctxt, "..", app).0,
-                    )
+                    write!(res, "{{ e.insert({value_str}); None }}")
                 };
             }),
             "Vacant(e)",
@@ -690,7 +681,8 @@ impl<'tcx> InsertSearchResults<'tcx> {
                         "..",
                         app,
                     ));
-                    res.push_str(&snippet_with_context(cx, insertion.value.span, ctxt, "..", app).0);
+                    let value_str = snippet_with_context(cx, insertion.value.span, ctxt, "..", app).0;
+                    let _: fmt::Result = write!(res, "{value_str}");
                     span = span.trim_start(insertion.call.span).unwrap_or(DUMMY_SP);
                 },
                 Edit::RemoveSemi(semi_span) => {