Adjust path names

Author: smoelius

crate/src/paths.rs

@@ -1,11 +1,11 @@
+pub const ANCHOR_LANG_ACCOUNT: [&str; 4] = ["anchor_lang", "accounts", "account", "Account"];
 pub const ANCHOR_LANG_CONTEXT: [&str; 3] = ["anchor_lang", "context", "Context"];
 pub const ANCHOR_LANG_SIGNER: [&str; 4] = ["anchor_lang", "accounts", "signer", "Signer"];
+pub const ANCHOR_LANG_DISCRIMINATOR_TRAIT: [&str; 2] = ["anchor_lang", "Discriminator"];
+pub const ANCHOR_LANG_TRY_DESERIALIZE: [&str; 3] =
+    ["anchor_lang", "AccountDeserialize", "try_deserialize"];
+
+pub const BORSH_TRY_FROM_SLICE: [&str; 4] = ["borsh", "de", "BorshDeserialize", "try_from_slice"];
 
 pub const SOLANA_PROGRAM_ACCOUNT_INFO: [&str; 3] =
     ["solana_program", "account_info", "AccountInfo"];
-pub const ANCHOR_ACCOUNT: [&str; 4] = ["anchor_lang", "accounts", "account", "Account"];
-pub const BORSH_TRY_FROM_SLICE: [&str; 4] = ["borsh", "de", "BorshDeserialize", "try_from_slice"];
-pub const ANCHOR_ACCOUNT: [&str; 4] = ["anchor_lang", "accounts", "account", "Account"];
-pub const ANCHOR_DISCRIMINATOR_TRAIT: [&str; 2] = ["anchor_lang", "Discriminator"];
-pub const ANCHOR_TRY_DESERIALIZE: [&str; 3] =
-    ["anchor_lang", "AccountDeserialize", "try_deserialize"];

lints/duplicate_mutable_accounts/src/alternate_constraint.rs

@@ -74,7 +74,7 @@ impl<'cx, 'tcx> Visitor<'tcx> for Values<'cx, 'tcx> {
             let middle_ty = self.cx.typeck_results().expr_ty(mut_expr);
             // let mut_expr_def_id = self.cx.tcx.hir().local_def_id(mut_expr.hir_id).to_def_id();
             // let middle_ty = self.cx.tcx.type_of(mut_expr_def_id);
-            if match_type(self.cx, middle_ty, &paths::ANCHOR_ACCOUNT);
+            if match_type(self.cx, middle_ty, &paths::ANCHOR_LANG_ACCOUNT);
             // grab T generic parameter
             if let MiddleTyKind::Adt(_adt_def, substs) = middle_ty.kind();
             if substs.len() == ANCHOR_ACCOUNT_GENERIC_ARG_COUNT;

lints/duplicate_mutable_accounts/src/lib.rs

@@ -96,7 +96,7 @@ impl<'tcx> LateLintPass<'tcx> for DuplicateMutableAccounts {
                 if_chain! {
                     if let Some(def_id) = get_def_id(field.ty);
                     let middle_ty = cx.tcx.type_of(def_id);
-                    if match_type(cx, middle_ty, &paths::ANCHOR_ACCOUNT);
+                    if match_type(cx, middle_ty, &paths::ANCHOR_LANG_ACCOUNT);
                     if let Some(account_id) = get_anchor_account_type_def_id(field);
                     then {
                         if let Some(v) = self.anchor_accounts.get_mut(&account_id) {

lints/type_cosplay/src/lib.rs

@@ -88,10 +88,10 @@ impl<'tcx> LateLintPass<'tcx> for TypeCosplay {
             let middle_ty = cx.tcx.type_of(def_id);
             then {
                 if_chain! {
-                    if let Some(trait_did) = get_trait_def_id(cx, &paths::ANCHOR_DISCRIMINATOR_TRAIT);
+                    if let Some(trait_did) = get_trait_def_id(cx, &paths::ANCHOR_LANG_DISCRIMINATOR_TRAIT);
                     if implements_trait(cx, middle_ty, trait_did, &[]);
                     if let Some(def_id) = cx.typeck_results().type_dependent_def_id(fnc_expr.hir_id);
-                    if !match_def_path(cx, def_id, &paths::ANCHOR_TRY_DESERIALIZE);
+                    if !match_def_path(cx, def_id, &paths::ANCHOR_LANG_TRY_DESERIALIZE);
                     then {
                         span_lint_and_help(
                             cx,