From: kyoto7250 <50972773+kyoto7250@users.noreply.github.com>
Date: Sat, 18 Jun 2022 09:29:39 +0000 (+0900)
Subject: cargo dev fmt
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=4a02ae9636d57dd4b5b93e5d2688f9eec5de39e9;p=rust.git

cargo dev fmt
---

diff --git a/clippy_lints/src/copies.rs b/clippy_lints/src/copies.rs
index f6e4d9a4f5c..1deff9684a1 100644
--- a/clippy_lints/src/copies.rs
+++ b/clippy_lints/src/copies.rs
@@ -195,10 +195,7 @@ fn lint_if_same_then_else(cx: &LateContext<'_>, conds: &[&Expr<'_>], blocks: &[&
         .array_windows::<2>()
         .enumerate()
         .fold(true, |all_eq, (i, &[lhs, rhs])| {
-            if eq.eq_block(lhs, rhs)
-                && !contains_let(conds[i])
-                && conds.get(i + 1).map_or(true, |e| !contains_let(e))
-            {
+            if eq.eq_block(lhs, rhs) && !contains_let(conds[i]) && conds.get(i + 1).map_or(true, |e| !contains_let(e)) {
                 span_lint_and_note(
                     cx,
                     IF_SAME_THEN_ELSE,
@@ -368,10 +365,6 @@ fn eq_stmts(
         .all(|b| get_stmt(b).map_or(false, |s| eq.eq_stmt(s, stmt)))
 }
 
-
-
-
-
 fn scan_block_for_eq(cx: &LateContext<'_>, _conds: &[&Expr<'_>], block: &Block<'_>, blocks: &[&Block<'_>]) -> BlockEq {
     let mut eq = SpanlessEq::new(cx);
     let mut eq = eq.inter_expr();
diff --git a/clippy_utils/src/hir_utils.rs b/clippy_utils/src/hir_utils.rs
index f21098f95f7..97a15108d0c 100644
--- a/clippy_utils/src/hir_utils.rs
+++ b/clippy_utils/src/hir_utils.rs
@@ -1,6 +1,6 @@
 use crate::consts::constant_simple;
-use crate::source::snippet_opt;
 use crate::macros::macro_backtrace;
+use crate::source::snippet_opt;
 use rustc_ast::ast::InlineAsmTemplatePiece;
 use rustc_data_structures::fx::FxHasher;
 use rustc_hir::def::Res;
@@ -88,12 +88,12 @@ pub fn eq_path_segments(&mut self, left: &[PathSegment<'_>], right: &[PathSegmen
     }
 
     fn cannot_be_compared_block(&mut self, block: &Block<'_>) -> bool {
-        if block.stmts.first().map_or(false, |stmt|
+        if block.stmts.first().map_or(false, |stmt| {
             matches!(
                 stmt.kind,
                 StmtKind::Semi(semi_expr) if self.should_ignore(semi_expr)
             )
-        ) {
+        }) {
             return true;
         }
 
@@ -107,12 +107,12 @@ fn cannot_be_compared_block(&mut self, block: &Block<'_>) -> bool {
     }
 
     fn should_ignore(&mut self, expr: &Expr<'_>) -> bool {
-        if macro_backtrace(expr.span).last().map_or(false, |macro_call|
+        if macro_backtrace(expr.span).last().map_or(false, |macro_call| {
             matches!(
                 &self.cx.tcx.get_diagnostic_name(macro_call.def_id),
                 Some(sym::todo_macro | sym::unimplemented_macro)
             )
-        ) {
+        }) {
             return true;
         }