move lint to EarlyAttributes, change applicability, add cfg test

rust-lang · Jul 21, 2023 · 491a30c · 491a30c
1 parent 87a6270
commit 491a30c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/clippy_lints/src/attrs.rs b/clippy_lints/src/attrs.rs
@@ -430,7 +430,6 @@ declare_clippy_lint! {
 
 declare_lint_pass!(Attributes => [
     ALLOW_ATTRIBUTES_WITHOUT_REASON,
-    SHOULD_PANIC_WITHOUT_REASON,
     INLINE_ALWAYS,
     DEPRECATED_SEMVER,
     USELESS_ATTRIBUTE,
@@ -744,6 +743,7 @@ impl_lint_pass!(EarlyAttributes => [
     EMPTY_LINE_AFTER_DOC_COMMENTS,
     NON_MINIMAL_CFG,
     MAYBE_MISUSED_CFG,
+    SHOULD_PANIC_WITHOUT_REASON,
 ]);
 
 impl EarlyLintPass for EarlyAttributes {
@@ -821,7 +821,7 @@ fn check_should_panic_reason<'cx>(cx: &EarlyContext<'cx>, attr: &'cx Attribute)
 
         if let AttrArgs::Delimited(args) = &normal_attr.item.args
             && let mut tt_iter = args.tokens.trees()
-            && let Some(TokenTree::Token(Token { kind: TokenKind::Ident(sym::expected, _),.. }, _)) = tt_iter.next()
+            && let Some(TokenTree::Token(Token { kind: TokenKind::Ident(sym::expected, _), .. }, _)) = tt_iter.next()
             && let Some(TokenTree::Token(Token { kind: TokenKind::Eq, .. }, _)) = tt_iter.next()
             && let Some(TokenTree::Token(Token { kind: TokenKind::Literal(_), .. }, _)) = tt_iter.next()
         {
@@ -835,8 +835,8 @@ fn check_should_panic_reason<'cx>(cx: &EarlyContext<'cx>, attr: &'cx Attribute)
             attr.span,
             "#[should_panic] attribute without a reason",
             "consider specifying the expected panic",
-            r#"#[should_panic(expected="<panic message>")]"#.into(),
-            Applicability::Unspecified
+            r#"#[should_panic(expected = /* panic message */)]"#.into(),
+            Applicability::HasPlaceholders
         );
     }
 }

diff --git a/tests/ui/should_panic_without_reason.rs b/tests/ui/should_panic_without_reason.rs
@@ -10,6 +10,11 @@ fn no_message() {}
 #[should_panic()]
 fn no_message2() {}
 
+#[cfg(test)]
+#[test]
+#[should_panic]
+fn no_message_cfg_false() {}
+
 #[should_panic = "message"]
 fn metastr() {}
 

diff --git a/tests/ui/should_panic_without_reason.stderr b/tests/ui/should_panic_without_reason.stderr
@@ -2,7 +2,7 @@ error: #[should_panic] attribute without a reason
   --> $DIR/should_panic_without_reason.rs:7:1
    |
 LL | #[should_panic]
-   | ^^^^^^^^^^^^^^^ help: consider specifying the expected panic: `#[should_panic(expected="<panic message>")]`
+   | ^^^^^^^^^^^^^^^ help: consider specifying the expected panic: `#[should_panic(expected = /* panic message */)]`
    |
 note: the lint level is defined here
   --> $DIR/should_panic_without_reason.rs:2:9
@@ -14,7 +14,13 @@ error: #[should_panic] attribute without a reason
   --> $DIR/should_panic_without_reason.rs:10:1
    |
 LL | #[should_panic()]
-   | ^^^^^^^^^^^^^^^^^ help: consider specifying the expected panic: `#[should_panic(expected="<panic message>")]`
+   | ^^^^^^^^^^^^^^^^^ help: consider specifying the expected panic: `#[should_panic(expected = /* panic message */)]`
 
-error: aborting due to 2 previous errors
+error: #[should_panic] attribute without a reason
+  --> $DIR/should_panic_without_reason.rs:15:1
+   |
+LL | #[should_panic]
+   | ^^^^^^^^^^^^^^^ help: consider specifying the expected panic: `#[should_panic(expected = /* panic message */)]`
+
+error: aborting due to 3 previous errors