Make Clippy happy

Author: smoelius

crate/tests/diff.rs

@@ -101,5 +101,5 @@ fn diff() {
 
 #[must_use]
 pub fn enabled(key: &str) -> bool {
-    std::env::var(key).map_or(false, |value| value != "0")
+    std::env::var(key).is_ok_and(|value| value != "0")
 }

lints/arbitrary_cpi/src/lib.rs

@@ -262,15 +262,12 @@ fn find_place_aliases<'tcx>(
         for stmt in body.basic_blocks[cur_block].statements.iter().rev() {
             match &stmt.kind {
                 // if the statement assigns to `inst_arg`, update `inst_arg` to the rhs
-                StatementKind::Assign(box (assign_place, rvalue))
-                    if assign_place.local_or_deref_local() == id_arg.local_or_deref_local() =>
-                {
-                    if let Rvalue::Use(Operand::Copy(pl) | Operand::Move(pl))
-                    | Rvalue::Ref(_, _, pl) = rvalue
-                    {
-                        id_arg = pl;
-                        likely_program_id_aliases.push(*pl);
-                    }
+                StatementKind::Assign(box (
+                    assign_place,
+                    Rvalue::Use(Operand::Copy(pl) | Operand::Move(pl)) | Rvalue::Ref(_, _, pl),
+                )) if assign_place.local_or_deref_local() == id_arg.local_or_deref_local() => {
+                    id_arg = pl;
+                    likely_program_id_aliases.push(*pl);
                 }
                 _ => {}
             }
@@ -356,21 +353,18 @@ fn is_moved_from<'tcx>(
     loop {
         for stmt in body.basic_blocks[cur_block].statements.iter().rev() {
             match &stmt.kind {
-                StatementKind::Assign(box (assign_place, rvalue))
-                    if assign_place.local_or_deref_local()
-                        == search_place.local_or_deref_local() =>
+                StatementKind::Assign(box (
+                    assign_place,
+                    Rvalue::Use(Operand::Copy(rvalue_place) | Operand::Move(rvalue_place))
+                    | Rvalue::Ref(_, _, rvalue_place),
+                )) if assign_place.local_or_deref_local()
+                    == search_place.local_or_deref_local() =>
                 {
-                    match rvalue {
-                        Rvalue::Use(Operand::Copy(rvalue_place) | Operand::Move(rvalue_place))
-                        | Rvalue::Ref(_, _, rvalue_place) => {
-                            search_place = rvalue_place;
-                            if let Some(search_loc) = search_place.local_or_deref_local() {
-                                if search_list.contains(&search_loc) {
-                                    return true;
-                                }
-                            }
+                    search_place = rvalue_place;
+                    if let Some(search_loc) = search_place.local_or_deref_local() {
+                        if search_list.contains(&search_loc) {
+                            return true;
                         }
-                        _ => {}
                     }
                 }
                 _ => {}

lints/bump_seed_canonicalization/src/lib.rs

@@ -276,7 +276,14 @@ impl BumpSeedCanonicalization {
                                     // the location of &[bump]. update it to store the location of bump.
                                     if let Operand::Move(pl) = &elements[FieldIdx::from_u32(0)] {
                                         // store the location of bump
-                                        seeds_arg = &pl;
+                                        // smoelius: Clippy recommends to remove the next borrow.
+                                        // However, removing the borrow causes the lint's warning
+                                        // message to change and the tests to fail. I don't
+                                        // understand why.
+                                        #[allow(clippy::needless_borrow)]
+                                        {
+                                            seeds_arg = &pl;
+                                        }
                                         likely_bump_seed_aliases.push(*seeds_arg);
                                         // seeds_arg is a location of bump
                                         state = BackwardDataflowState::Bump;
@@ -321,24 +328,19 @@ impl BumpSeedCanonicalization {
         loop {
             for stmt in body.basic_blocks[cur_block].statements.iter().rev() {
                 match &stmt.kind {
-                    StatementKind::Assign(box (assign_place, rvalue))
-                        if assign_place.local_or_deref_local()
-                            == search_place.local_or_deref_local() =>
+                    StatementKind::Assign(box (
+                        assign_place,
+                        Rvalue::Use(Operand::Copy(rvalue_place) | Operand::Move(rvalue_place))
+                        | Rvalue::Ref(_, _, rvalue_place),
+                    )) if assign_place.local_or_deref_local()
+                        == search_place.local_or_deref_local() =>
                     {
-                        match rvalue {
-                            Rvalue::Use(
-                                Operand::Copy(rvalue_place) | Operand::Move(rvalue_place),
-                            )
-                            | Rvalue::Ref(_, _, rvalue_place) => {
-                                // println!("Found assignment {:?}", stmt);
-                                search_place = rvalue_place;
-                                if let Some(search_loc) = search_place.local_or_deref_local() {
-                                    if search_list.contains(&search_loc) {
-                                        return true;
-                                    }
-                                }
+                        // println!("Found assignment {:?}", stmt);
+                        search_place = rvalue_place;
+                        if let Some(search_loc) = search_place.local_or_deref_local() {
+                            if search_list.contains(&search_loc) {
+                                return true;
                             }
-                            _ => {}
                         }
                     }
                     _ => {}

lints/missing_owner_check/src/lib.rs

@@ -235,7 +235,7 @@ fn get_referenced_accounts<'tcx>(
     accounts.uses
 }
 
-impl<'cx, 'tcx> Visitor<'tcx> for AccountUses<'cx, 'tcx> {
+impl<'tcx> Visitor<'tcx> for AccountUses<'_, 'tcx> {
     fn visit_expr(&mut self, expr: &'tcx Expr<'tcx>) {
         if_chain! {
             // s3v3ru5: the following check removes duplicate warnings where lint would report both `x` and `x.clone()` expressions.
@@ -366,7 +366,7 @@ fn is_safe_constraint_for_owner(constraints: &ConstraintGroup) -> bool {
         || constraints
             .init
             .as_ref()
-            .map_or(false, |init_constraint| init_constraint.if_needed)
+            .is_some_and(|init_constraint| init_constraint.if_needed)
         || constraints.seeds.is_some()
         || constraints.address.is_some()
         || constraints.owner.is_some()

lints/sysvar_get/src/lib.rs

@@ -134,7 +134,7 @@ fn find_from_account_info_exprs<'tcx>(
     f.uses
 }
 
-impl<'cx, 'tcx> Visitor<'tcx> for FromAccountInfoUses<'cx, 'tcx> {
+impl<'tcx> Visitor<'tcx> for FromAccountInfoUses<'_, 'tcx> {
     fn visit_expr(&mut self, expr: &'tcx Expr<'tcx>) {
         if_chain! {
             if let ExprKind::Call(func, _) = expr.kind;