Match on bool should be replaced with if..else block

1. Added another conditional in `check_expr` impl to lint if match expr
is a bool.
2. Test cases.
This commit is contained in:
Vikas Kumar 2015-10-20 10:18:48 -07:00
parent dea087dd17
commit 2951b70d15
3 changed files with 41 additions and 1 deletions

View File

@ -138,6 +138,7 @@ pub fn plugin_registrar(reg: &mut Registry) {
loops::WHILE_LET_LOOP,
matches::MATCH_REF_PATS,
matches::SINGLE_MATCH,
matches::MATCH_BOOL,
methods::SHOULD_IMPLEMENT_TRAIT,
methods::STR_TO_STRING,
methods::STRING_TO_STRING,

View File

@ -1,5 +1,6 @@
use rustc::lint::*;
use rustc_front::hir::*;
use rustc::middle::ty;
use utils::{snippet, span_lint, span_help_and_lint, in_external_macro, expr_block};
@ -9,13 +10,15 @@ declare_lint!(pub SINGLE_MATCH, Warn,
declare_lint!(pub MATCH_REF_PATS, Warn,
"a match has all arms prefixed with `&`; the match expression can be \
dereferenced instead");
declare_lint!(pub MATCH_BOOL, Warn,
"a match on boolean expression; recommends `if..else` block instead");
#[allow(missing_copy_implementations)]
pub struct MatchPass;
impl LintPass for MatchPass {
fn get_lints(&self) -> LintArray {
lint_array!(SINGLE_MATCH, MATCH_REF_PATS)
lint_array!(SINGLE_MATCH, MATCH_REF_PATS, MATCH_BOOL)
}
}
@ -59,6 +62,16 @@ impl LateLintPass for MatchPass {
expression to match: `match *{} {{ ...`", snippet(cx, ex.span, "..")));
}
}
// check preconditions for MATCH_BOOL
// type of expression == bool
if is_bool_expr(cx, ex) {
if in_external_macro(cx, expr.span) { return; }
span_lint(cx, MATCH_BOOL, expr.span,
"you seem to be trying to match on a boolean expression. \
Consider using if..else block");
}
}
}
}
@ -71,6 +84,10 @@ fn is_unit_expr(expr: &Expr) -> bool {
}
}
fn is_bool_expr(cx: &LateContext, ex: &Expr ) -> bool {
cx.tcx.expr_ty(ex).sty == ty::TyBool
}
fn has_only_ref_pats(arms: &[Arm]) -> bool {
let mapped = arms.iter().flat_map(|a| &a.pats).map(|p| match p.node {
PatRegion(..) => Some(true), // &-patterns

View File

@ -38,6 +38,28 @@ fn single_match(){
}
}
fn match_bool() {
let test: bool = true;
match test { //~ ERROR you seem to be trying to match on a boolean expression
true => (),
false => (),
};
let option = 1;
match option == 1 { //~ ERROR you seem to be trying to match on a boolean expression
true => (),
false => (),
};
// Not linted
match option {
1 ... 10 => (),
10 ... 20 => (),
_ => (),
};
}
fn ref_pats() {
{
let v = &Some(0);