change recommended to recommended-2

Author: oslfmt

crate/diffs/type_cosplay.diff

@@ -17,27 +17,17 @@ Only in ../../../../lints/type_cosplay/ui/insecure/src: lib.stderr
 Only in ../../../../lints/type_cosplay/ui: insecure-2
 Only in ../../../../lints/type_cosplay/ui: insecure-3
 Only in ../../../../lints/type_cosplay/ui: insecure-anchor
-diff -r ./recommended/Cargo.toml ../../../../lints/type_cosplay/ui/recommended/Cargo.toml
-19c19
-< anchor-lang = "0.20.1"
----
-> anchor-lang = "0.25.0"
 diff -r ./recommended/src/lib.rs ../../../../lints/type_cosplay/ui/recommended/src/lib.rs
-10c10,17
+10c10,12
 <     pub fn update_user(ctx: Context<UpdateUser>) -> ProgramResult {
 ---
 >     pub fn update_user(
 >         ctx: Context<UpdateUser>,
 >     ) -> anchor_lang::solana_program::entrypoint::ProgramResult {
->         let account_info: &AccountInfo = ctx.accounts.user.as_ref();
->         let mut data = &*account_info.data.take();
->         let user = User::try_deserialize(&mut data).unwrap();
-> 
->         msg!("User: {:?}", user.authority);
-31a39,40
+31a34,35
 > 
 > fn main() {}
-Only in ../../../../lints/type_cosplay/ui/recommended/src: lib.stderr
+Only in ../../../../lints/type_cosplay/ui: recommended-2
 diff -r ./secure/src/lib.rs ../../../../lints/type_cosplay/ui/secure/src/lib.rs
 10c10,12
 <     pub fn update_user(ctx: Context<UpdateUser>) -> ProgramResult {

lints/type_cosplay/Cargo.toml

@@ -29,6 +29,10 @@ path = "ui/insecure-anchor/src/lib.rs"
 name = "recommended"
 path = "ui/recommended/src/lib.rs"
 
+[[example]]
+name = "recommended-2"
+path = "ui/recommended-2/src/lib.rs"
+
 [[example]]
 name = "secure"
 path = "ui/secure/src/lib.rs"

lints/type_cosplay/README.md

@@ -81,6 +81,12 @@ deserialize without any problem into a `User` struct, leading to a type-cosplay
 
 ### recommended
 
+The recommended way to address the type-cosplay issue. It adds an `#[account]` macro to each
+struct, which adds a discriminant to each struct. It doesn't actually perform any deserializations,
+which is why the `recommended-2` was created.
+
+### recommended-2
+
 This is secure code because all structs have an `#[account]` macro attributed
 on them, thus deriving the `Discriminator` trait for each. Further, unlike the insecure-anchor
 example, the program uses the proper deserialization method, `try_deserialize`, to deserialize

lints/type_cosplay/src/lib.rs

@@ -9,7 +9,9 @@ extern crate rustc_middle;
 extern crate rustc_span;
 
 use clippy_utils::{
-    diagnostics::span_lint_and_help, get_trait_def_id, match_def_path, ty::{match_type, implements_trait},
+    diagnostics::span_lint_and_help,
+    get_trait_def_id, match_def_path,
+    ty::{implements_trait, match_type},
 };
 use rustc_data_structures::fx::FxHashMap;
 use rustc_hir::{def::Res, Expr, ExprKind, QPath, TyKind};
@@ -64,18 +66,12 @@ struct TypeCosplay {
     deser_types: FxHashMap<AdtKind, Vec<(DefId, Span)>>,
 }
 
-// get type X
-// check if implements Discriminator
-// check corresponding function call type:
-// if !try_deserialize
-// emit lint with warning to use try_deserialize (because any types deriving Discriminator should since it guaranteed to check discrim)
-
 impl<'tcx> LateLintPass<'tcx> for TypeCosplay {
     fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) {
         if_chain! {
             if !expr.span.from_expansion();
             if let ExprKind::Call(fnc_expr, args_exprs) = expr.kind;
-            // TODO: recommended case will exit early since it contains a reference to AccountInfo.data,
+            // TODO: recommended-2 case will exit early since it contains a reference to AccountInfo.data,
             // not a direct argument. In general, any references will fail
             if args_exprs.iter().any(|arg| {
                 visit_expr_no_bodies(arg, |expr| contains_data_field_reference(cx, expr))
@@ -259,3 +255,8 @@ fn secure_two() {
 fn recommended() {
     dylint_testing::ui_test_example(env!("CARGO_PKG_NAME"), "recommended");
 }
+
+#[test]
+fn recommended_2() {
+    dylint_testing::ui_test_example(env!("CARGO_PKG_NAME"), "recommended-2");
+}

lints/type_cosplay/ui/recommended-2/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "type-cosplay-recommended"
+version = "0.1.0"
+description = "Created with Anchor"
+edition = "2018"
+
+[lib]
+crate-type = ["cdylib", "lib"]
+name = "type_cosplay_recommended"
+
+[features]
+no-entrypoint = []
+no-idl = []
+no-log-ix-name = []
+cpi = ["no-entrypoint"]
+default = []
+
+[dependencies]
+anchor-lang = "0.25.0"

lints/type_cosplay/ui/recommended-2/Xargo.toml

@@ -0,0 +1,2 @@
+[target.bpfel-unknown-unknown.dependencies.std]
+features = []

lints/type_cosplay/ui/recommended-2/src/lib.rs

@@ -0,0 +1,40 @@
+use anchor_lang::prelude::*;
+use borsh::{BorshDeserialize, BorshSerialize};
+
+declare_id!("Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS");
+
+#[program]
+pub mod type_cosplay_recommended {
+    use super::*;
+
+    pub fn update_user(
+        ctx: Context<UpdateUser>,
+    ) -> anchor_lang::solana_program::entrypoint::ProgramResult {
+        let account_info: &AccountInfo = ctx.accounts.user.as_ref();
+        let mut data = &*account_info.data.take();
+        let user = User::try_deserialize(&mut data).unwrap();
+
+        msg!("User: {:?}", user.authority);
+        msg!("GM {}", ctx.accounts.user.authority);
+        Ok(())
+    }
+}
+
+#[derive(Accounts)]
+pub struct UpdateUser<'info> {
+    #[account(has_one = authority)]
+    user: Account<'info, User>,
+    authority: Signer<'info>,
+}
+
+#[account]
+pub struct User {
+    authority: Pubkey,
+}
+
+#[account]
+pub struct Metadata {
+    account: Pubkey,
+}
+
+fn main() {}

lints/type_cosplay/ui/recommended-2/src/lib.stderr

@@ -16,4 +16,4 @@ cpi = ["no-entrypoint"]
 default = []
 
 [dependencies]
-anchor-lang = "0.25.0"
+anchor-lang = "0.20.1"

lints/type_cosplay/ui/recommended/Cargo.toml

@@ -10,11 +10,6 @@ pub mod type_cosplay_recommended {
     pub fn update_user(
         ctx: Context<UpdateUser>,
     ) -> anchor_lang::solana_program::entrypoint::ProgramResult {
-        let account_info: &AccountInfo = ctx.accounts.user.as_ref();
-        let mut data = &*account_info.data.take();
-        let user = User::try_deserialize(&mut data).unwrap();
-
-        msg!("User: {:?}", user.authority);
         msg!("GM {}", ctx.accounts.user.authority);
         Ok(())
     }