clean up lint messages

Author: oslfmt

lints/type_cosplay/src/lib.rs

@@ -113,7 +113,7 @@ impl<'tcx> LateLintPass<'tcx> for TypeCosplay {
                 spans[0],
                 "Deserializing from different ADT types.",
                 Some(spans[1]),
-                "help: deserialize from only structs with a discriminant, or an enum encapsulating all structs."
+                "deserialize from only structs with a discriminant, or an enum encapsulating all structs."
             );
         }
     }
@@ -150,9 +150,9 @@ fn check_enums(cx: &LateContext<'_>, enums: &Vec<(DefId, Span)>) {
             cx,
             TYPE_COSPLAY,
             first_span,
-            "warning: multiple enum types deserialized. Should only have one enum type to avoid possible equivalent types",
+            "multiple enum types deserialized. Should only have one enum type to avoid possible equivalent types",
             Some(second_span),
-            "help: consider constructing a single enum that contains all type definitions as variants"
+            "consider constructing a single enum that contains all type definitions as variants"
         );
     } else if enums.len() == 1 {
         // future check - check that single enum is safe
@@ -185,16 +185,16 @@ fn has_discriminant(cx: &LateContext, adt: AdtDef, num_struct_types: usize, span
                 cx,
                 TYPE_COSPLAY,
                 span,
-                "warning: type does not have a proper discriminant. It may be indistinguishable when deserialized.",
+                "type does not have a proper discriminant. It may be indistinguishable when deserialized.",
                 None,
-                "help: add an enum with at least as many variants as there are struct definitions"
+                "add an enum with at least as many variants as there are struct definitions"
             )
         }
     }
 }
 
 #[test]
-fn insecure_1() {
+fn insecure() {
     dylint_testing::ui_test_example(env!("CARGO_PKG_NAME"), "insecure");
 }
 

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

@@ -1,11 +1,11 @@
-error: warning: multiple enum types deserialized. Should only have one enum type to avoid possible equivalent types
+error: multiple enum types deserialized. Should only have one enum type to avoid possible equivalent types
   --> $DIR/lib.rs:27:20
    |
 LL |         let user = UserInfo::try_from_slice(&ctx.accounts.user.data.borrow()).unwrap();
    |                    ^^^^^^^^
    |
    = note: `-D type-cosplay` implied by `-D warnings`
-help: help: consider constructing a single enum that contains all type definitions as variants
+help: consider constructing a single enum that contains all type definitions as variants
   --> $DIR/lib.rs:41:24
    |
 LL |         let metadata = MetadataInfo::try_from_slice(&ctx.accounts.user.data.borrow()).unwrap();

lints/type_cosplay/ui/insecure-3/src/lib.rs

@@ -25,7 +25,8 @@ pub mod type_cosplay_secure {
         }
         msg!("GM {}", user.authority);
 
-        let extra = Instruction::try_from_slice(&ctx.accounts.user.data.borrow()).unwrap();
+        let _extra =
+            AccountWithDiscriminant::try_from_slice(&ctx.accounts.user.data.borrow()).unwrap();
         Ok(())
     }
 }

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

@@ -5,11 +5,11 @@ LL |         let user = User::try_from_slice(&ctx.accounts.user.data.borrow()).u
    |                    ^^^^
    |
    = note: `-D type-cosplay` implied by `-D warnings`
-help: help: deserialize from only structs with a discriminant, or an enum encapsulating all structs.
-  --> $DIR/lib.rs:28:21
+help: deserialize from only structs with a discriminant, or an enum encapsulating all structs.
+  --> $DIR/lib.rs:29:13
    |
-LL |         let extra = Instruction::try_from_slice(&ctx.accounts.user.data.borrow()).unwrap();
-   |                     ^^^^^^^^^^^
+LL |             AccountWithDiscriminant::try_from_slice(&ctx.accounts.user.data.borrow()).unwrap();
+   |             ^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
 

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

@@ -1,11 +1,11 @@
-error: warning: type does not have a proper discriminant. It may be indistinguishable when deserialized.
+error: type does not have a proper discriminant. It may be indistinguishable when deserialized.
   --> $DIR/lib.rs:13:20
    |
 LL |         let user = User::try_from_slice(&ctx.accounts.user.data.borrow()).unwrap();
    |                    ^^^^
    |
    = note: `-D type-cosplay` implied by `-D warnings`
-   = help: help: add an enum with at least as many variants as there are struct definitions
+   = help: add an enum with at least as many variants as there are struct definitions
 
 error: aborting due to previous error