-
Notifications
You must be signed in to change notification settings - Fork 1.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add assert(true) and assert(false) lints #3582
Changes from 4 commits
98c5f37
3d9535a
9605861
906b516
7075015
a9f8d3c
58abdb5
f11d993
c771f33
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
// Copyright 2014-2018 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
use crate::rustc::hir::{Expr, ExprKind}; | ||
use crate::rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; | ||
use crate::rustc::{declare_tool_lint, lint_array}; | ||
use crate::syntax::ast::LitKind; | ||
use crate::utils::{is_direct_expn_of, span_lint, span_lint_and_sugg}; | ||
use rustc_errors::Applicability; | ||
use if_chain::if_chain; | ||
|
||
/// **What it does:** Check explicit call assert!(true/false) | ||
/// | ||
/// **Why is this bad?** Will be optimized out by the compiler or should probably be replaced by a panic!() or unreachable!() | ||
/// | ||
/// **Known problems:** None | ||
/// | ||
/// **Example:** | ||
/// ```rust | ||
/// assert!(false) | ||
/// // or | ||
/// assert!(true) | ||
/// // or | ||
/// const B: bool = false; | ||
/// assert!(B) | ||
/// ``` | ||
declare_clippy_lint! { | ||
pub ASSERTIONS_ON_CONSTANTS, | ||
style, | ||
"assert!(true/false) will be optimized out by the compiler/should probably be replaced by a panic!() or unreachable!()" | ||
} | ||
|
||
pub struct AssertionsOnConstants; | ||
|
||
impl LintPass for AssertionsOnConstants { | ||
fn get_lints(&self) -> LintArray { | ||
lint_array![ASSERTIONS_ON_CONSTANTS] | ||
} | ||
} | ||
|
||
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for AssertionsOnConstants { | ||
fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, e: &'tcx Expr) { | ||
if_chain! { | ||
if is_direct_expn_of(e.span, "assert").is_some(); | ||
if let ExprKind::Unary(_, ref lit) = e.node; | ||
if let ExprKind::Lit(ref inner) = lit.node; | ||
then { | ||
match inner.node { | ||
LitKind::Bool(true) => { | ||
span_lint(cx, ASSERTIONS_ON_CONSTANTS, e.span, | ||
"assert!(true) will be optimized out by the compiler"); | ||
}, | ||
LitKind::Bool(false) => { | ||
span_lint_and_sugg( | ||
cx, | ||
ASSERTIONS_ON_CONSTANTS, | ||
e.span, | ||
"assert!(false) should probably be replaced", | ||
"try", | ||
"panic!()".to_string(), | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Work in progress. I pushed the current state of PR to test span_lint_and_sugg. Seems it not work as expected for |
||
Applicability::MachineApplicable); | ||
}, | ||
_ => (), | ||
} | ||
} | ||
} | ||
} | ||
} |
Original file line number | Diff line number | Diff line change | ||||||||
---|---|---|---|---|---|---|---|---|---|---|
@@ -0,0 +1,13 @@ | ||||||||||
// Copyright 2014-2018 The Rust Project Developers. See the COPYRIGHT | ||||||||||
// file at the top-level directory of this distribution. | ||||||||||
// | ||||||||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||||||||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||||||||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||||||||||
// option. This file may not be copied, modified, or distributed | ||||||||||
// except according to those terms. | ||||||||||
|
||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||
fn main() { | ||||||||||
assert!(true); | ||||||||||
assert!(false); | ||||||||||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
error: assert!(true) will be optimized out by the compiler | ||
--> $DIR/assertions_on_constants.rs:11:5 | ||
| | ||
LL | assert!(true); | ||
| ^^^^^^^^^^^^^^ | ||
| | ||
= note: `-D clippy::assertions-on-constants` implied by `-D warnings` | ||
|
||
error: assert!(false) should probably be replaced | ||
--> $DIR/assertions_on_constants.rs:12:5 | ||
| | ||
LL | assert!(false); | ||
| ^^^^^^^^^^^^^^^ help: try: `panic!()` | ||
|
||
error: aborting due to 2 previous errors | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
span_lint_and_sugg
should work. The problem you had was in theassert(true)
branch but you were still usingspan_lint
there.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mikerite I check it here:
https://github.com/rust-lang/rust-clippy/pull/3582/files/7075015f311617710dcebfe6530bdca732287994#diff-fc99a0c4e187ac372040420fe4dcb24cR60
Test case:
https://github.com/rust-lang/rust-clippy/pull/3582/files/7075015f311617710dcebfe6530bdca732287994#diff-514c75729f8046fc08cc8bb536b2fd0aR13
Failed CI on this test:
https://travis-ci.com/rust-lang/rust-clippy/jobs/169168148#L1259