Skip to content

Commit

Permalink
fix false positive (panic message) with assert macro using message pa…
Browse files Browse the repository at this point in the history
…rameter
  • Loading branch information
iobtl committed Jul 6, 2021
1 parent 64d74df commit eeefbb7
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
4 changes: 3 additions & 1 deletion clippy_lints/src/panic_unimplemented.rs
Expand Up @@ -74,7 +74,9 @@ declare_lint_pass!(PanicUnimplemented => [UNIMPLEMENTED, UNREACHABLE, TODO, PANI

impl<'tcx> LateLintPass<'tcx> for PanicUnimplemented {
fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
if match_panic_call(cx, expr).is_some() && is_expn_of(expr.span, "debug_assert").is_none() {
if match_panic_call(cx, expr).is_some()
&& (is_expn_of(expr.span, "debug_assert").is_none() && is_expn_of(expr.span, "assert").is_none())
{
let span = get_outer_span(expr);
if is_expn_of(expr.span, "unimplemented").is_some() {
span_lint(
Expand Down
16 changes: 16 additions & 0 deletions tests/ui/panicking_macros.rs
Expand Up @@ -43,6 +43,18 @@ fn core_versions() {
unreachable!();
}

fn assert() {
assert!(true);
assert_eq!(true, true);
assert_ne!(true, false);
}

fn assert_msg() {
assert!(true, "this should not panic");
assert_eq!(true, true, "this should not panic");
assert_ne!(true, false, "this should not panic");
}

fn debug_assert() {
debug_assert!(true);
debug_assert_eq!(true, true);
Expand All @@ -61,4 +73,8 @@ fn main() {
unimplemented();
unreachable();
core_versions();
assert();
assert_msg();
debug_assert();
debug_assert_msg();
}

0 comments on commit eeefbb7

Please sign in to comment.