fix lint spanning deduplication issue

Author: oslfmt

lints/duplicate-mutable-accounts/src/lib.rs

@@ -83,10 +83,6 @@ impl<'tcx> LateLintPass<'tcx> for DuplicateMutableAccounts {
             if name.as_str() == "account";
             if let MacArgs::Delimited(_, _, token_stream) = &attr_item.args;
             then {
-                // Parse each constraint as a separate TokenStream
-                // for delimited_stream in split(token_stream.trees(), TokenKind::Comma) {
-                //     self.streams.0.push(delimited_stream);
-                // }
                 self.streams.0.push(token_stream.clone());
             }
         }
@@ -107,13 +103,11 @@ impl<'tcx> LateLintPass<'tcx> for DuplicateMutableAccounts {
                         if !(self.streams.contains(&stream)
                             || self.streams.contains(&symmetric_stream))
                         {
-                            // NOTE: for some reason, will only print out 2 messages, not 3
-                            // println!("spanning lint");
                             span_lint_and_help(
                                 cx,
                                 DUPLICATE_MUTABLE_ACCOUNTS,
                                 first_span,
-                                "identical account types without a key check constraint",
+                                &format!("{} and {} have identical account types but do not have a key check constraint", first, other),
                                 Some(*other_span),
                                 &format!("add an anchor key check constraint: #[account(constraint = {}.key() != {}.key())]", first, other)
                             );
@@ -212,7 +206,6 @@ impl Streams {
             for (j, other_token) in other.trees().enumerate() {
                 match stream.trees().nth(i + j) {
                     Some(token_tree) => {
-                        // println!("Comparing {:#?} with {:#?}", token_tree, other_tokens[j]);
                         if !token_tree.eq_unspanned(other_token) {
                             break;
                         }
@@ -229,24 +222,6 @@ impl Streams {
     }
 }
 
-// /// Splits `stream` into a vector of substreams, separated by `delimiter`.
-// fn split(stream: CursorRef, delimiter: TokenKind) -> Vec<TokenStream> {
-//     let mut split_streams: Vec<TokenStream> = Vec::new();
-//     let mut temp: Vec<TreeAndSpacing> = Vec::new();
-//     let delim = TokenTree::Token(Token::new(delimiter, DUMMY_SP));
-
-//     stream.for_each(|t| {
-//         if t.eq_unspanned(&delim) {
-//             split_streams.push(TokenStream::new(temp.clone()));
-//             temp.clear();
-//         } else {
-//             temp.push(TreeAndSpacing::from(t.clone()));
-//         }
-//     });
-//     split_streams.push(TokenStream::new(temp));
-//     split_streams
-// }
-
 #[test]
 fn insecure() {
     dylint_testing::ui_test_example(env!("CARGO_PKG_NAME"), "insecure");

lints/duplicate-mutable-accounts/ui/insecure-2/src/lib.rs

@@ -22,7 +22,6 @@ pub mod duplicate_mutable_accounts_insecure {
 
 #[derive(Accounts)]
 pub struct Update<'info> {
-    #[account(constraint = user_a.key() != user_b.key(), constraint = user_b.key() != user_c.key())]
     user_a: Account<'info, User>,
     user_b: Account<'info, User>,
     user_c: Account<'info, User>,

lints/duplicate-mutable-accounts/ui/insecure-2/src/lib.stderr

@@ -1,15 +1,39 @@
-error: identical account types without a key check constraint
-  --> $DIR/lib.rs:26:5
+error: user_a and user_b have identical account types but do not have a key check constraint
+  --> $DIR/lib.rs:25:5
    |
 LL |     user_a: Account<'info, User>,
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: `-D duplicate-mutable-accounts` implied by `-D warnings`
+help: add an anchor key check constraint: #[account(constraint = user_a.key() != user_b.key())]
+  --> $DIR/lib.rs:26:5
+   |
+LL |     user_b: Account<'info, User>,
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: user_a and user_c have identical account types but do not have a key check constraint
+  --> $DIR/lib.rs:25:5
+   |
+LL |     user_a: Account<'info, User>,
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
 help: add an anchor key check constraint: #[account(constraint = user_a.key() != user_c.key())]
-  --> $DIR/lib.rs:28:5
+  --> $DIR/lib.rs:27:5
+   |
+LL |     user_c: Account<'info, User>,
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: user_b and user_c have identical account types but do not have a key check constraint
+  --> $DIR/lib.rs:26:5
+   |
+LL |     user_b: Account<'info, User>,
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: add an anchor key check constraint: #[account(constraint = user_b.key() != user_c.key())]
+  --> $DIR/lib.rs:27:5
    |
 LL |     user_c: Account<'info, User>,
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to previous error
+error: aborting due to 3 previous errors
 

lints/duplicate-mutable-accounts/ui/insecure/src/lib.stderr

@@ -1,4 +1,4 @@
-error: identical account types without a key check constraint
+error: user_a and user_b have identical account types but do not have a key check constraint
   --> $DIR/lib.rs:25:5
    |
 LL |     user_a: Account<'info, User>,