Update lints

Author: smoelius

lints/insecure_account_close/Cargo.lock

@@ -30,15 +30,15 @@ name = "secure"
 path = "ui/secure/src/lib.rs"
 
 [dependencies]
-clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "c995a8b5017766246ac5cfe66baa074eeee3a5a3" }
-dylint_linting = "2.0.2"
+clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "0cb0f7636851f9fcc57085cf80197a2ef6db098f" }
+dylint_linting = "2.0.7"
 if_chain = "1.0.2"
 solana-lints = { path = "../../crate" }
 
 [dev-dependencies]
 anchor-lang = "0.24.2"
 assert_cmd = "2.0.4"
-dylint_testing = "2.0.2"
+dylint_testing = "2.0.7"
 predicates = "2.1.1"
 tempfile = "3.3.0"
 

lints/insecure_account_close/Cargo.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-03-24"
+channel = "nightly-2022-06-30"
 components = ["llvm-tools-preview", "rustc-dev"]

lints/insecure_account_close/rust-toolchain

@@ -1,4 +1,3 @@
-#![feature(bool_to_option)]
 #![feature(rustc_private)]
 #![recursion_limit = "256"]
 #![warn(unused_extern_crates)]
@@ -12,10 +11,7 @@ use if_chain::if_chain;
 use rustc_ast::ast::{LitIntType, LitKind};
 use rustc_hir::{BinOpKind, Body, BorrowKind, Expr, ExprKind, LangItem, Mutability, QPath, UnOp};
 use rustc_lint::{LateContext, LateLintPass};
-use rustc_middle::{
-    mir::interpret::ConstValue,
-    ty::{ConstKind, TyKind, UintTy},
-};
+use rustc_middle::ty::{TyKind, UintTy};
 use solana_lints::utils::visit_expr_no_bodies;
 
 dylint_linting::declare_late_lint! {
@@ -80,7 +76,7 @@ fn contains_initial_eight_byte_copy_slice<'tcx>(body: &'tcx Body<'tcx>) -> bool
     .is_some()
 }
 
-fn is_initial_eight_byte_copy_from_slice<'tcx>(expr: &Expr<'tcx>) -> bool {
+fn is_initial_eight_byte_copy_from_slice(expr: &Expr<'_>) -> bool {
     if_chain! {
         if let ExprKind::MethodCall(method_name, args, _) = expr.kind;
         if method_name.ident.as_str() == "copy_from_slice";
@@ -130,8 +126,7 @@ fn is_eight_byte_array<'tcx>(cx: &LateContext<'tcx>, expr: &Expr<'tcx>) -> bool
     if_chain! {
         if let TyKind::Array(ty, length) = ty.kind();
         if *ty.kind() == TyKind::Uint(UintTy::U8);
-        if let ConstKind::Value(ConstValue::Scalar(length)) = length.val();
-        if let Ok(length) = length.to_machine_usize(&cx.tcx);
+        if let Some(length) = length.try_eval_usize(cx.tcx, cx.param_env);
         if length == 8;
         then {
             true
@@ -145,7 +140,7 @@ fn contains_manual_clear<'tcx>(body: &'tcx Body<'tcx>) -> bool {
     visit_expr_no_bodies(&body.value, |expr| is_manual_clear(expr).then_some(())).is_some()
 }
 
-fn is_manual_clear<'tcx>(expr: &Expr<'tcx>) -> bool {
+fn is_manual_clear(expr: &Expr<'_>) -> bool {
     if_chain! {
         if let Some(higher::ForLoop { body, .. }) = higher::ForLoop::hir(expr);
         if contains_zero_assignment(body);
@@ -158,7 +153,7 @@ fn is_manual_clear<'tcx>(expr: &Expr<'tcx>) -> bool {
 }
 
 fn contains_zero_assignment<'tcx>(expr: &'tcx Expr<'tcx>) -> bool {
-    visit_expr_no_bodies(expr, |expr| is_zero_assignment(expr)).is_some()
+    visit_expr_no_bodies(expr, is_zero_assignment).is_some()
 }
 
 fn is_zero_assignment<'tcx>(expr: &'tcx Expr<'tcx>) -> Option<&'tcx Expr<'tcx>> {

lints/insecure_account_close/src/lib.rs

@@ -26,13 +26,13 @@ name = "fixed-secure"
 path = "ui/fixed-secure/src/lib.rs"
 
 [dependencies]
-clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "7b2896a8fc9f0b275692677ee6d2d66a7cbde16a" }
-dylint_linting = "2.0.1"
+clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "0cb0f7636851f9fcc57085cf80197a2ef6db098f" }
+dylint_linting = "2.0.7"
 if_chain = "1.0.2"
 solana-lints = { path = "../../crate" }
 
 [dev-dependencies]
-dylint_testing = "2.0.1"
+dylint_testing = "2.0.7"
 anchor-lang = "0.24.2"
 spl-token = "3.3.0"
 anchor-spl = "0.24.2"

lints/missing_owner_check/Cargo.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-02-24"
+channel = "nightly-2022-06-30"
 components = ["llvm-tools-preview", "rustc-dev"]

lints/missing_owner_check/rust-toolchain

@@ -6,7 +6,10 @@ extern crate rustc_span;
 
 use clippy_utils::{diagnostics::span_lint, ty::match_type, SpanlessEq};
 use if_chain::if_chain;
-use rustc_hir::{intravisit::{FnKind, Visitor, walk_expr}, Body, Expr, ExprKind, FnDecl, HirId};
+use rustc_hir::{
+    intravisit::{walk_expr, FnKind, Visitor},
+    Body, Expr, ExprKind, FnDecl, HirId,
+};
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_span::Span;
 use solana_lints::{paths, utils::visit_expr_no_bodies};
@@ -52,8 +55,8 @@ impl<'tcx> LateLintPass<'tcx> for MissingOwnerCheck {
                         cx,
                         MISSING_OWNER_CHECK,
                         account_expr.span,
-                        "this Account struct is used but there is no check on its owner field"
-                    )
+                        "this Account struct is used but there is no check on its owner field",
+                    );
                 }
             }
         }
@@ -65,7 +68,10 @@ struct AccountUses<'cx, 'tcx> {
     uses: Vec<&'tcx Expr<'tcx>>,
 }
 
-fn get_referenced_accounts<'tcx>(cx: &LateContext<'tcx>, body: &'tcx Body<'tcx>) -> Vec<&'tcx Expr<'tcx>> {
+fn get_referenced_accounts<'tcx>(
+    cx: &LateContext<'tcx>,
+    body: &'tcx Body<'tcx>,
+) -> Vec<&'tcx Expr<'tcx>> {
     let mut accounts = AccountUses {
         cx,
         uses: Vec::new(),
@@ -87,20 +93,24 @@ impl<'cx, 'tcx> Visitor<'tcx> for AccountUses<'cx, 'tcx> {
                 self.uses.push(expr);
             }
         }
-        walk_expr(self, expr)
+        walk_expr(self, expr);
     }
 }
 
 fn contains_owner_use<'tcx>(
-    cx: &LateContext<'tcx>, 
+    cx: &LateContext<'tcx>,
     body: &'tcx Body<'tcx>,
-    account_expr: &Expr<'tcx>
+    account_expr: &Expr<'tcx>,
 ) -> bool {
     visit_expr_no_bodies(&body.value, |expr| uses_owner_field(cx, expr, account_expr))
 }
 
 /// Checks if `expr` is an owner field reference on `account_expr`
-fn uses_owner_field<'tcx>(cx: &LateContext<'tcx>, expr: &Expr<'tcx>, account_expr: &Expr<'tcx>) -> bool {
+fn uses_owner_field<'tcx>(
+    cx: &LateContext<'tcx>,
+    expr: &Expr<'tcx>,
+    account_expr: &Expr<'tcx>,
+) -> bool {
     if_chain! {
         if let ExprKind::Field(object, field_name) = expr.kind;
         // TODO: add check for key, is_signer

lints/missing_owner_check/src/lib.rs

@@ -8,7 +8,7 @@ edition = "2021"
 
 [lib]
 crate-type = ["cdylib", "lib"]
-name = "account_data_matching_secure_fixed"
+name = "owner_checks_secure_fixed"
 
 [features]
 no-entrypoint = []
@@ -20,4 +20,4 @@ default = []
 [dependencies]
 anchor-lang = "0.24.2"
 anchor-spl = "0.24.2"
-spl-token = "3.2.0"
+spl-token = "3.2.0"

lints/missing_owner_check/ui/fixed-secure/Cargo.toml

@@ -1,8 +1,5 @@
 use anchor_lang::prelude::*;
-use anchor_lang::solana_program::{
-  program_pack::Pack,
-  entrypoint::ProgramResult,
-};
+use anchor_lang::solana_program::{entrypoint::ProgramResult, program_pack::Pack};
 use spl_token::state::Account as SplTokenAccount;
 
 declare_id!("Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS");

lints/missing_owner_check/ui/fixed-secure/src/lib.rs

@@ -1,12 +1,12 @@
 [package]
-name = "account-data-matching-insecure"
+name = "owner-checks-insecure"
 version = "0.1.0"
 description = "Created with Anchor"
 edition = "2018"
 
 [lib]
 crate-type = ["cdylib", "lib"]
-name = "account_data_matching_insecure"
+name = "owner_checks_insecure"
 
 [features]
 no-entrypoint = []
@@ -18,4 +18,4 @@ default = []
 [dependencies]
 anchor-lang = "0.24.2"
 anchor-spl = "0.24.2"
-spl-token = "3.2.0"
+spl-token = "3.2.0"