Dogfood fixes

Co-authored-by: Ada Alakbarova <ada.alakbarova@proton.me>

Author: barun511

clippy_dev/src/serve.rs

@@ -85,10 +85,9 @@ fn is_metadata_outdated(time: SystemTime) -> bool {
     dir.map_while(|e| log_err_and_continue(e, ".".as_ref())).any(|e| {
         let name = e.file_name();
         let name_bytes = name.as_encoded_bytes();
-        if (name_bytes.starts_with(b"clippy_lints") && name_bytes != b"clippy_lints_internal")
-            || name_bytes == b"clippy_config"
-        {
-            WalkDir::new(&name)
+        ((name_bytes.starts_with(b"clippy_lints") && name_bytes != b"clippy_lints_internal")
+            || name_bytes == b"clippy_config")
+            && WalkDir::new(&name)
                 .into_iter()
                 .map_while(|e| log_err_and_continue(e, name.as_ref()))
                 .filter(|e| e.file_type().is_file())
@@ -97,8 +96,5 @@ fn is_metadata_outdated(time: SystemTime) -> bool {
                         .and_then(|m| log_err_and_continue(m.modified(), e.path()))
                 })
                 .any(|ftime| time < ftime)
-        } else {
-            false
-        }
     })
 }

clippy_lints/src/functions/must_use.rs

@@ -255,11 +255,8 @@ fn is_mutable_pat(cx: &LateContext<'_>, pat: &hir::Pat<'_>, tys: &mut DefIdSet)
     if let hir::PatKind::Wild = pat.kind {
         return false; // ignore `_` patterns
     }
-    if cx.tcx.has_typeck_results(pat.hir_id.owner.def_id) {
-        is_mutable_ty(cx, cx.tcx.typeck(pat.hir_id.owner.def_id).pat_ty(pat), tys)
-    } else {
-        false
-    }
+    cx.tcx.has_typeck_results(pat.hir_id.owner.def_id)
+        && is_mutable_ty(cx, cx.tcx.typeck(pat.hir_id.owner.def_id).pat_ty(pat), tys)
 }
 
 fn is_mutable_ty<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>, tys: &mut DefIdSet) -> bool {

clippy_lints/src/literal_representation.rs

@@ -351,11 +351,7 @@ impl LiteralDigitGrouping {
         }
 
         let group_sizes: Vec<usize> = num_lit.integer.split('_').map(str::len).collect();
-        if UUID_GROUP_LENS.len() == group_sizes.len() {
-            iter::zip(&UUID_GROUP_LENS, &group_sizes).all(|(&a, &b)| a == b)
-        } else {
-            false
-        }
+        UUID_GROUP_LENS.len() == group_sizes.len() && iter::zip(&UUID_GROUP_LENS, &group_sizes).all(|(&a, &b)| a == b)
     }
 
     /// Given the sizes of the digit groups of both integral and fractional

clippy_lints/src/no_effect.rs

@@ -254,11 +254,9 @@ fn has_no_effect(cx: &LateContext<'_>, expr: &Expr<'_>) -> bool {
                     cx.qpath_res(qpath, callee.hir_id),
                     Res::Def(DefKind::Struct | DefKind::Variant | DefKind::Ctor(..), ..)
                 );
-                if def_matched || is_range_literal(expr) {
-                    !expr_ty_has_significant_drop(cx, expr) && args.iter().all(|arg| has_no_effect(cx, arg))
-                } else {
-                    false
-                }
+                (def_matched || is_range_literal(expr))
+                    && !expr_ty_has_significant_drop(cx, expr)
+                    && args.iter().all(|arg| has_no_effect(cx, arg))
             } else {
                 false
             }

clippy_lints/src/unit_types/unit_arg.rs

@@ -40,14 +40,12 @@ pub(super) fn check<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) {
         .into_iter()
         .chain(args)
         .filter(|arg| {
-            if cx.typeck_results().expr_ty(arg).is_unit() && !utils::is_unit_literal(arg) {
-                !matches!(
+            cx.typeck_results().expr_ty(arg).is_unit()
+                && !utils::is_unit_literal(arg)
+                && !matches!(
                     &arg.kind,
                     ExprKind::Match(.., MatchSource::TryDesugar(_)) | ExprKind::Path(..)
                 )
-            } else {
-                false
-            }
         })
         .collect::<Vec<_>>();
     if !args_to_recover.is_empty() && !is_from_proc_macro(cx, expr) {

clippy_utils/src/hir_utils.rs

@@ -852,12 +852,11 @@ impl HirEqInterExpr<'_, '_, '_> {
     }
 
     fn eq_path_parameters(&mut self, left: &GenericArgs<'_>, right: &GenericArgs<'_>) -> bool {
-        if left.parenthesized == right.parenthesized {
-            over(left.args, right.args, |l, r| self.eq_generic_arg(l, r)) // FIXME(flip1995): may not work
-                && over(left.constraints, right.constraints, |l, r| self.eq_assoc_eq_constraint(l, r))
-        } else {
-            false
-        }
+        left.parenthesized == right.parenthesized
+            && over(left.args, right.args, |l, r| self.eq_generic_arg(l, r)) // FIXME(flip1995): may not work
+            && over(left.constraints, right.constraints, |l, r| {
+                self.eq_assoc_eq_constraint(l, r)
+            })
     }
 
     pub fn eq_path_segments<'tcx>(