Address clippy lints

Author: scottgerring

clippy_lints/src/unit_types/let_unit_value.rs

@@ -9,6 +9,7 @@ use rustc_hir::{Expr, ExprKind, HirId, HirIdSet, LetStmt, MatchSource, Node, Pat
 use rustc_lint::{LateContext, LintContext};
 use rustc_middle::lint::{in_external_macro, is_from_async_await};
 use rustc_middle::ty;
+use std::cmp::Ordering;
 
 use super::LET_UNIT_VALUE;
 
@@ -82,7 +83,7 @@ pub(super) fn check<'tcx>(cx: &LateContext<'tcx>, local: &'tcx LetStmt<'_>) {
 
                     // If this is a binding pattern, we need to add suggestions to remove any usages
                     // of the variable
-                    if let PatKind::Binding(_, binding_hir_id, _, ..) = local.pat.kind
+                    if let PatKind::Binding(_, binding_hir_id, ..) = local.pat.kind
                         && let Some(body_id) = cx.enclosing_body.as_ref()
                     {
                         let body = cx.tcx.hir().body(*body_id);
@@ -96,19 +97,25 @@ pub(super) fn check<'tcx>(cx: &LateContext<'tcx>, local: &'tcx LetStmt<'_>) {
                     }
 
                     // Emit appropriate diagnostic based on whether there are usages of the let binding
-                    if suggestions.len() == 1 {
-                        diag.multipart_suggestion(
-                            "omit the `let` binding",
-                            suggestions,
-                            Applicability::MachineApplicable,
-                        );
-                    } else if suggestions.len() > 1 {
-                        diag.multipart_suggestion(
-                            "omit the `let` binding and replace variable usages with `()`",
-                            suggestions,
-                            Applicability::MachineApplicable,
-                        );
-                    }
+                    match suggestions.len().cmp(&1) {
+                        Ordering::Equal => {
+                            diag.multipart_suggestion(
+                                "omit the `let` binding",
+                                suggestions,
+                                Applicability::MachineApplicable,
+                            );
+                            ()
+                        },
+                        Ordering::Greater => {
+                            diag.multipart_suggestion(
+                                "omit the `let` binding and replace variable usages with `()`",
+                                suggestions,
+                                Applicability::MachineApplicable,
+                            );
+                            ()
+                        },
+                        Ordering::Less => (),
+                    };
                 },
             );
         }