nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-14 13:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

display suggestion separately from lint

Browse Source
This commit is contained in:
Joshua Holmer 2016-02-09 14:44:42 -05:00
parent 56b3e7b4c2
commit 14292674b0
2 changed files with 45 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/needless_bool.rs
View File

@ -8,7 +8,7 @@ use rustc_front::hir::*;
use syntax::ast::Lit_;
use syntax::codemap::Spanned;
use utils::{span_lint, snippet};
use utils::{span_lint, span_lint_and_then, snippet};
/// **What it does:** This lint checks for expressions of the form `if c { true } else { false }` (or vice versa) and suggest using the condition directly.
///
@ -109,34 +109,46 @@ impl LateLintPass for BoolComparison {
(Some(true), None) => {
let side_snip = snippet(cx, right_side.span, "..");
let hint = format!("`{}`", side_snip);
span_lint(cx,
BOOL_COMPARISON,
e.span,
&format!("you can simplify this boolean comparison to {}", hint));
span_lint_and_then(cx,
BOOL_COMPARISON,
e.span,
"equality checks against booleans are unnecesary",
|db| {
db.span_suggestion(e.span, "try simplifying it:", hint);
});
}
(None, Some(true)) => {
let side_snip = snippet(cx, left_side.span, "..");
let hint = format!("`{}`", side_snip);
span_lint(cx,
BOOL_COMPARISON,
e.span,
&format!("you can simplify this boolean comparison to {}", hint));
span_lint_and_then(cx,
BOOL_COMPARISON,
e.span,
"equality checks against booleans are unnecesary",
|db| {
db.span_suggestion(e.span, "try simplifying it:", hint);
});
}
(Some(false), None) => {
let side_snip = snippet(cx, right_side.span, "..");
let hint = format!("`!{}`", side_snip);
span_lint(cx,
BOOL_COMPARISON,
e.span,
&format!("you can simplify this boolean comparison to {}", hint));
span_lint_and_then(cx,
BOOL_COMPARISON,
e.span,
"equality checks against booleans are unnecesary",
|db| {
db.span_suggestion(e.span, "try simplifying it:", hint);
});
}
(None, Some(false)) => {
let side_snip = snippet(cx, left_side.span, "..");
let hint = format!("`!{}`", side_snip);
span_lint(cx,
BOOL_COMPARISON,
e.span,
&format!("you can simplify this boolean comparison to {}", hint));
span_lint_and_then(cx,
BOOL_COMPARISON,
e.span,
"equality checks against booleans are unnecesary",
|db| {
db.span_suggestion(e.span, "try simplifying it:", hint);
});
}
_ => (),
}

21
tests/compile-fail/bool_comparison.rs
View File

@ -1,12 +1,23 @@
#![feature(plugin)]
#![plugin(clippy)]
#[allow(needless_bool)]
#[deny(bool_comparison)]
fn main() {
let x = true;
if x == true { true } else { false }; //~ERROR you can simplify this boolean comparison to `x`
if x == false { true } else { false }; //~ERROR you can simplify this boolean comparison to `!x`
if true == x { true } else { false }; //~ERROR you can simplify this boolean comparison to `x`
if false == x { true } else { false }; //~ERROR you can simplify this boolean comparison to `!x`
if x == true { "yes" } else { "no" };
//~^ ERROR equality checks against booleans are unnecesary
//~| HELP try simplifying it:
//~| SUGGESTION x
if x == false { "yes" } else { "no" };
//~^ ERROR equality checks against booleans are unnecesary
//~| HELP try simplifying it:
//~| SUGGESTION !x
if true == x { "yes" } else { "no" };
//~^ ERROR equality checks against booleans are unnecesary
//~| HELP try simplifying it:
//~| SUGGESTION x
if false == x { "yes" } else { "no" };
//~^ ERROR equality checks against booleans are unnecesary
//~| HELP try simplifying it:
//~| SUGGESTION !x
}