fix recommended case and filter out macro exprs

Author: oslfmt

crate/diffs/type_cosplay.diff

@@ -16,14 +16,25 @@ diff -r ./insecure/src/lib.rs ../../../../lints/type_cosplay/ui/insecure/src/lib
 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,12
+10c10,17
 <     pub fn update_user(ctx: Context<UpdateUser>) -> ProgramResult {
 ---
 >     pub fn update_user(
 >         ctx: Context<UpdateUser>,
 >     ) -> anchor_lang::solana_program::entrypoint::ProgramResult {
-31a34,35
+>         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
 > 
 > fn main() {}
 Only in ../../../../lints/type_cosplay/ui/recommended/src: lib.stderr

lints/type_cosplay/src/lib.rs

@@ -73,15 +73,17 @@ struct TypeCosplay {
 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: is the following if statement really needed?? don't think it's ever used.
             // all it does is check if AccountInfo.data is referenced...but what bytes we deser
             // from shouldn't impact if this is a type-cosplay issue or not.
             // walk each argument expression and see if the data field is referenced
+            // TODO: maybe just check arg is a byte array
             // if args_exprs.iter().any(|arg| {
             //     visit_expr_no_bodies(arg, |expr| contains_data_field_reference(cx, expr))
             // });
-            // get the type that the function was called on, ie X in X::deser()
+            // get the type that the function was called on, ie X in X::call()
             if let ExprKind::Path(qpath) = &fnc_expr.kind;
             if let QPath::TypeRelative(ty, _) = qpath;
             if let TyKind::Path(ty_qpath) = &ty.kind;
@@ -98,8 +100,10 @@ impl<'tcx> LateLintPass<'tcx> for TypeCosplay {
                                 cx,
                                 TYPE_COSPLAY,
                                 fnc_expr.span,
-                                &format!("{} type implements the anchor_lang::Discriminator trait. If you are using #[account] to derive Discriminator, use try_deserialize() instead.",
-                                    middle_ty),
+                                &format!("`{}` type implements the `Discriminator` trait. If you are attempting to deserialize\n here and `{}` is annotated with #[account] use try_deserialize() instead.",
+                                    middle_ty,
+                                    middle_ty
+                                ),
                                 None,
                                 "otherwise, make sure you are accounting for this type's discriminator in your deserialization function"
                             );

lints/type_cosplay/ui/insecure-anchor/src/lib.stderr

@@ -1,4 +1,5 @@
-error: User type implements the anchor_lang::Discriminator trait. If you are using #[account] to derive Discriminator, use try_deserialize() instead.
+error: `User` type implements the `Discriminator` trait. If you are attempting to deserialize
+        here and `User` is annotated with #[account] use try_deserialize() instead.
   --> $DIR/lib.rs:13:20
    |
 LL |         let user = User::try_from_slice(&ctx.accounts.user.data.borrow()).unwrap();