diff --git a/README.md b/README.md index 20aaa03c51c1..d134afe8a8e6 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ A collection of lints to catch common mistakes and improve your Rust code. [Jump to usage instructions](#usage) ##Lints -There are 114 lints included in this crate: +There are 116 lints included in this crate: name | default | meaning ---------------------------------------------------------------------------------------------------------------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ @@ -47,6 +47,8 @@ name [for_loop_over_option](https://github.com/Manishearth/rust-clippy/wiki#for_loop_over_option) | warn | for-looping over an `Option`, which is more clearly expressed as an `if let` [for_loop_over_result](https://github.com/Manishearth/rust-clippy/wiki#for_loop_over_result) | warn | for-looping over a `Result`, which is more clearly expressed as an `if let` [identity_op](https://github.com/Manishearth/rust-clippy/wiki#identity_op) | warn | using identity operations, e.g. `x + 0` or `y / 1` +[if_same_then_else](https://github.com/Manishearth/rust-clippy/wiki#if_same_then_else) | warn | if with the same *then* and *else* blocks +[ifs_same_cond](https://github.com/Manishearth/rust-clippy/wiki#ifs_same_cond) | warn | consecutive `ifs` with the same condition [ineffective_bit_mask](https://github.com/Manishearth/rust-clippy/wiki#ineffective_bit_mask) | warn | expressions where a bit mask will be rendered useless by a comparison, e.g. `(x | 1) > 2` [inline_always](https://github.com/Manishearth/rust-clippy/wiki#inline_always) | warn | `#[inline(always)]` is a bad idea in most cases [invalid_regex](https://github.com/Manishearth/rust-clippy/wiki#invalid_regex) | deny | finds invalid regular expressions in `Regex::new(_)` invocations diff --git a/src/copies.rs b/src/copies.rs new file mode 100644 index 000000000000..525c7b7a6fde --- /dev/null +++ b/src/copies.rs @@ -0,0 +1,102 @@ +use rustc::lint::*; +use rustc_front::hir::*; +use utils::{get_parent_expr, in_macro, is_block_equal, is_exp_equal, span_lint, span_note_and_lint}; + +/// **What it does:** This lint checks for consecutive `ifs` with the same condition. This lint is +/// `Warn` by default. +/// +/// **Why is this bad?** This is probably a copy & paste error. +/// +/// **Known problems:** Hopefully none. +/// +/// **Example:** `if a == b { .. } else if a == b { .. }` +declare_lint! { + pub IFS_SAME_COND, + Warn, + "consecutive `ifs` with the same condition" +} + +/// **What it does:** This lint checks for `if/else` with the same body as the *then* part and the +/// *else* part. This lint is `Warn` by default. +/// +/// **Why is this bad?** This is probably a copy & paste error. +/// +/// **Known problems:** Hopefully none. +/// +/// **Example:** `if .. { 42 } else { 42 }` +declare_lint! { + pub IF_SAME_THEN_ELSE, + Warn, + "if with the same *then* and *else* blocks" +} + +#[derive(Copy, Clone, Debug)] +pub struct CopyAndPaste; + +impl LintPass for CopyAndPaste { + fn get_lints(&self) -> LintArray { + lint_array![ + IFS_SAME_COND, + IF_SAME_THEN_ELSE + ] + } +} + +impl LateLintPass for CopyAndPaste { + fn check_expr(&mut self, cx: &LateContext, expr: &Expr) { + if !in_macro(cx, expr.span) { + lint_same_then_else(cx, expr); + lint_same_cond(cx, expr); + } + } +} + +/// Implementation of `IF_SAME_THEN_ELSE`. +fn lint_same_then_else(cx: &LateContext, expr: &Expr) { + if let ExprIf(_, ref then_block, Some(ref else_expr)) = expr.node { + if let ExprBlock(ref else_block) = else_expr.node { + if is_block_equal(cx, &then_block, &else_block, false) { + span_lint(cx, IF_SAME_THEN_ELSE, expr.span, "this if has the same then and else blocks"); + } + } + } +} + +/// Implementation of `IFS_SAME_COND`. +fn lint_same_cond(cx: &LateContext, expr: &Expr) { + // skip ifs directly in else, it will be checked in the parent if + if let Some(&Expr{node: ExprIf(_, _, Some(ref else_expr)), ..}) = get_parent_expr(cx, expr) { + if else_expr.id == expr.id { + return; + } + } + + let conds = condition_sequence(expr); + + for (n, i) in conds.iter().enumerate() { + for j in conds.iter().skip(n+1) { + if is_exp_equal(cx, i, j, true) { + span_note_and_lint(cx, IFS_SAME_COND, j.span, "this if has the same condition as a previous if", i.span, "same as this"); + } + } + } +} + +/// Return the list of condition expressions in a sequence of `if/else`. +/// Eg. would return `[a, b]` for the expression `if a {..} else if b {..}`. +fn condition_sequence(mut expr: &Expr) -> Vec<&Expr> { + let mut result = vec![]; + + while let ExprIf(ref cond, _, ref else_expr) = expr.node { + result.push(&**cond); + + if let Some(ref else_expr) = *else_expr { + expr = else_expr; + } + else { + break; + } + } + + result +} diff --git a/src/entry.rs b/src/entry.rs index 64d6fa7be38b..d5bb086fc213 100644 --- a/src/entry.rs +++ b/src/entry.rs @@ -89,7 +89,7 @@ fn check_for_insert(cx: &LateContext, span: Span, map: &Expr, key: &Expr, expr: params.len() == 3, name.node.as_str() == "insert", get_item_name(cx, map) == get_item_name(cx, &*params[0]), - is_exp_equal(cx, key, ¶ms[1]) + is_exp_equal(cx, key, ¶ms[1], false) ], { let help = if sole_expr { format!("{}.entry({}).or_insert({})", diff --git a/src/eq_op.rs b/src/eq_op.rs index 49037cd9ae7f..aecd0693ff1f 100644 --- a/src/eq_op.rs +++ b/src/eq_op.rs @@ -4,9 +4,11 @@ use rustc_front::util as ast_util; use utils::{is_exp_equal, span_lint}; -/// **What it does:** This lint checks for equal operands to comparisons and bitwise binary operators (`&`, `|` and `^`). +/// **What it does:** This lint checks for equal operands to comparison, logical and bitwise, +/// difference and division binary operators (`==`, `>`, etc., `&&`, `||`, `&`, `|`, `^`, `-` and +/// `/`). /// -/// **Why is this bad?** This is usually just a typo. +/// **Why is this bad?** This is usually just a typo or a copy and paste error. /// /// **Known problems:** False negatives: We had some false positives regarding calls (notably [racer](https://github.com/phildawes/racer) had one instance of `x.pop() && x.pop()`), so we removed matching any function or method calls. We may introduce a whitelist of known pure functions in the future. /// @@ -29,19 +31,21 @@ impl LintPass for EqOp { impl LateLintPass for EqOp { fn check_expr(&mut self, cx: &LateContext, e: &Expr) { if let ExprBinary(ref op, ref left, ref right) = e.node { - if is_cmp_or_bit(op) && is_exp_equal(cx, left, right) { + if is_valid_operator(op) && is_exp_equal(cx, left, right, true) { span_lint(cx, EQ_OP, e.span, - &format!("equal expressions as operands to {}", ast_util::binop_to_string(op.node))); + &format!("equal expressions as operands to `{}`", ast_util::binop_to_string(op.node))); } } } } -fn is_cmp_or_bit(op: &BinOp) -> bool { +fn is_valid_operator(op: &BinOp) -> bool { match op.node { + BiSub | + BiDiv | BiEq | BiLt | BiLe | diff --git a/src/lib.rs b/src/lib.rs index fa98beb8d746..35ec0e13c3c1 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -37,6 +37,7 @@ use rustc_plugin::Registry; #[macro_use] pub mod utils; +pub mod copies; pub mod consts; pub mod types; pub mod misc; @@ -157,6 +158,7 @@ pub fn plugin_registrar(reg: &mut Registry) { reg.register_late_lint_pass(box drop_ref::DropRefPass); reg.register_late_lint_pass(box types::AbsurdUnsignedComparisons); reg.register_late_lint_pass(box regex::RegexPass); + reg.register_late_lint_pass(box copies::CopyAndPaste); reg.register_lint_group("clippy_pedantic", vec![ enum_glob_use::ENUM_GLOB_USE, @@ -190,6 +192,8 @@ pub fn plugin_registrar(reg: &mut Registry) { block_in_if_condition::BLOCK_IN_IF_CONDITION_EXPR, block_in_if_condition::BLOCK_IN_IF_CONDITION_STMT, collapsible_if::COLLAPSIBLE_IF, + copies::IF_SAME_THEN_ELSE, + copies::IFS_SAME_COND, cyclomatic_complexity::CYCLOMATIC_COMPLEXITY, derive::DERIVE_HASH_NOT_EQ, derive::EXPL_IMPL_CLONE_ON_COPY, diff --git a/src/strings.rs b/src/strings.rs index f1a1341460e6..b78db7f4b771 100644 --- a/src/strings.rs +++ b/src/strings.rs @@ -84,7 +84,7 @@ impl LateLintPass for StringAdd { if let Some(ref p) = parent { if let ExprAssign(ref target, _) = p.node { // avoid duplicate matches - if is_exp_equal(cx, target, left) { + if is_exp_equal(cx, target, left, false) { return; } } @@ -113,7 +113,7 @@ fn is_string(cx: &LateContext, e: &Expr) -> bool { fn is_add(cx: &LateContext, src: &Expr, target: &Expr) -> bool { match src.node { - ExprBinary(Spanned{ node: BiAdd, .. }, ref left, _) => is_exp_equal(cx, target, left), + ExprBinary(Spanned{ node: BiAdd, .. }, ref left, _) => is_exp_equal(cx, target, left, false), ExprBlock(ref block) => { block.stmts.is_empty() && block.expr.as_ref().map_or(false, |expr| is_add(cx, expr, target)) } diff --git a/src/utils.rs b/src/utils.rs index 74c1de6976f1..a8890f31cb03 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -589,29 +589,183 @@ fn parse_attrs(sess: &Session, attrs: &[ast::Attribute], name: &' } } -pub fn is_exp_equal(cx: &LateContext, left: &Expr, right: &Expr) -> bool { +/// Check whether two statements are the same. +/// See also `is_exp_equal`. +pub fn is_stmt_equal(cx: &LateContext, left: &Stmt, right: &Stmt, ignore_fn: bool) -> bool { + match (&left.node, &right.node) { + (&StmtDecl(ref l, _), &StmtDecl(ref r, _)) => { + if let (&DeclLocal(ref l), &DeclLocal(ref r)) = (&l.node, &r.node) { + // TODO: tys + l.ty.is_none() && r.ty.is_none() && + both(&l.init, &r.init, |l, r| is_exp_equal(cx, l, r, ignore_fn)) + } + else { + false + } + } + (&StmtExpr(ref l, _), &StmtExpr(ref r, _)) => is_exp_equal(cx, l, r, ignore_fn), + (&StmtSemi(ref l, _), &StmtSemi(ref r, _)) => is_exp_equal(cx, l, r, ignore_fn), + _ => false, + } +} + +/// Check whether two blocks are the same. +/// See also `is_exp_equal`. +pub fn is_block_equal(cx: &LateContext, left: &Block, right: &Block, ignore_fn: bool) -> bool { + over(&left.stmts, &right.stmts, |l, r| is_stmt_equal(cx, l, r, ignore_fn)) && + both(&left.expr, &right.expr, |l, r| is_exp_equal(cx, l, r, ignore_fn)) +} + +/// Check whether two pattern are the same. +/// See also `is_exp_equal`. +pub fn is_pat_equal(cx: &LateContext, left: &Pat, right: &Pat, ignore_fn: bool) -> bool { + match (&left.node, &right.node) { + (&PatBox(ref l), &PatBox(ref r)) => { + is_pat_equal(cx, l, r, ignore_fn) + } + (&PatEnum(ref lp, ref la), &PatEnum(ref rp, ref ra)) => { + is_path_equal(lp, rp) && + both(la, ra, |l, r| { + over(l, r, |l, r| is_pat_equal(cx, l, r, ignore_fn)) + }) + } + (&PatIdent(ref lb, ref li, ref lp), &PatIdent(ref rb, ref ri, ref rp)) => { + lb == rb && li.node.name.as_str() == ri.node.name.as_str() && + both(lp, rp, |l, r| is_pat_equal(cx, l, r, ignore_fn)) + } + (&PatLit(ref l), &PatLit(ref r)) => { + is_exp_equal(cx, l, r, ignore_fn) + } + (&PatQPath(ref ls, ref lp), &PatQPath(ref rs, ref rp)) => { + is_qself_equal(ls, rs) && is_path_equal(lp, rp) + } + (&PatTup(ref l), &PatTup(ref r)) => { + over(l, r, |l, r| is_pat_equal(cx, l, r, ignore_fn)) + } + (&PatRange(ref ls, ref le), &PatRange(ref rs, ref re)) => { + is_exp_equal(cx, ls, rs, ignore_fn) && + is_exp_equal(cx, le, re, ignore_fn) + } + (&PatRegion(ref le, ref lm), &PatRegion(ref re, ref rm)) => { + lm == rm && is_pat_equal(cx, le, re, ignore_fn) + } + (&PatVec(ref ls, ref li, ref le), &PatVec(ref rs, ref ri, ref re)) => { + over(ls, rs, |l, r| is_pat_equal(cx, l, r, ignore_fn)) && + over(le, re, |l, r| is_pat_equal(cx, l, r, ignore_fn)) && + both(li, ri, |l, r| is_pat_equal(cx, l, r, ignore_fn)) + } + (&PatWild, &PatWild) => true, + _ => false, + } +} + +/// Check whether two expressions are the same. This is different from the operator `==` on +/// expression as this operator would compare true equality with ID and span. +/// If `ignore_fn` is true, never consider as equal fonction calls. +/// +/// Note that some expression kinds are not considered but could be added. +#[allow(cyclomatic_complexity)] // ok, it’s a big function, but mostly one big match with simples cases +pub fn is_exp_equal(cx: &LateContext, left: &Expr, right: &Expr, ignore_fn: bool) -> bool { if let (Some(l), Some(r)) = (constant(cx, left), constant(cx, right)) { if l == r { return true; } } + match (&left.node, &right.node) { + (&ExprAddrOf(ref lmut, ref le), &ExprAddrOf(ref rmut, ref re)) => { + lmut == rmut && is_exp_equal(cx, le, re, ignore_fn) + } + (&ExprAgain(li), &ExprAgain(ri)) => { + both(&li, &ri, |l, r| l.node.name.as_str() == r.node.name.as_str()) + } + (&ExprAssign(ref ll, ref lr), &ExprAssign(ref rl, ref rr)) => { + is_exp_equal(cx, ll, rl, ignore_fn) && is_exp_equal(cx, lr, rr, ignore_fn) + } + (&ExprAssignOp(ref lo, ref ll, ref lr), &ExprAssignOp(ref ro, ref rl, ref rr)) => { + lo.node == ro.node && is_exp_equal(cx, ll, rl, ignore_fn) && is_exp_equal(cx, lr, rr, ignore_fn) + } + (&ExprBlock(ref l), &ExprBlock(ref r)) => { + is_block_equal(cx, l, r, ignore_fn) + } + (&ExprBinary(lop, ref ll, ref lr), &ExprBinary(rop, ref rl, ref rr)) => { + lop.node == rop.node && is_exp_equal(cx, ll, rl, ignore_fn) && is_exp_equal(cx, lr, rr, ignore_fn) + } + (&ExprBreak(li), &ExprBreak(ri)) => { + both(&li, &ri, |l, r| l.node.name.as_str() == r.node.name.as_str()) + } + (&ExprBox(ref l), &ExprBox(ref r)) => { + is_exp_equal(cx, l, r, ignore_fn) + } + (&ExprCall(ref lfun, ref largs), &ExprCall(ref rfun, ref rargs)) => { + !ignore_fn && + is_exp_equal(cx, lfun, rfun, ignore_fn) && + is_exps_equal(cx, largs, rargs, ignore_fn) + } + (&ExprCast(ref lx, ref lt), &ExprCast(ref rx, ref rt)) => { + is_exp_equal(cx, lx, rx, ignore_fn) && is_cast_ty_equal(lt, rt) + } (&ExprField(ref lfexp, ref lfident), &ExprField(ref rfexp, ref rfident)) => { - lfident.node == rfident.node && is_exp_equal(cx, lfexp, rfexp) + lfident.node == rfident.node && is_exp_equal(cx, lfexp, rfexp, ignore_fn) + } + (&ExprIndex(ref la, ref li), &ExprIndex(ref ra, ref ri)) => { + is_exp_equal(cx, la, ra, ignore_fn) && is_exp_equal(cx, li, ri, ignore_fn) + } + (&ExprIf(ref lc, ref lt, ref le), &ExprIf(ref rc, ref rt, ref re)) => { + is_exp_equal(cx, lc, rc, ignore_fn) && + is_block_equal(cx, lt, rt, ignore_fn) && + both(le, re, |l, r| is_exp_equal(cx, l, r, ignore_fn)) } (&ExprLit(ref l), &ExprLit(ref r)) => l.node == r.node, + (&ExprMatch(ref le, ref la, ref ls), &ExprMatch(ref re, ref ra, ref rs)) => { + ls == rs && + is_exp_equal(cx, le, re, ignore_fn) && + over(la, ra, |l, r| { + is_exp_equal(cx, &l.body, &r.body, ignore_fn) && + both(&l.guard, &r.guard, |l, r| is_exp_equal(cx, l, r, ignore_fn)) && + over(&l.pats, &r.pats, |l, r| is_pat_equal(cx, l, r, ignore_fn)) + }) + } + (&ExprMethodCall(ref lname, ref ltys, ref largs), &ExprMethodCall(ref rname, ref rtys, ref rargs)) => { + // TODO: tys + !ignore_fn && + lname.node == rname.node && + ltys.is_empty() && + rtys.is_empty() && + is_exps_equal(cx, largs, rargs, ignore_fn) + } + (&ExprRange(ref lb, ref le), &ExprRange(ref rb, ref re)) => { + both(lb, rb, |l, r| is_exp_equal(cx, l, r, ignore_fn)) && + both(le, re, |l, r| is_exp_equal(cx, l, r, ignore_fn)) + } + (&ExprRepeat(ref le, ref ll), &ExprRepeat(ref re, ref rl)) => { + is_exp_equal(cx, le, re, ignore_fn) && is_exp_equal(cx, ll, rl, ignore_fn) + } + (&ExprRet(ref l), &ExprRet(ref r)) => { + both(l, r, |l, r| is_exp_equal(cx, l, r, ignore_fn)) + } (&ExprPath(ref lqself, ref lsubpath), &ExprPath(ref rqself, ref rsubpath)) => { both(lqself, rqself, is_qself_equal) && is_path_equal(lsubpath, rsubpath) } - (&ExprTup(ref ltup), &ExprTup(ref rtup)) => is_exps_equal(cx, ltup, rtup), - (&ExprVec(ref l), &ExprVec(ref r)) => is_exps_equal(cx, l, r), - (&ExprCast(ref lx, ref lt), &ExprCast(ref rx, ref rt)) => is_exp_equal(cx, lx, rx) && is_cast_ty_equal(lt, rt), + (&ExprTup(ref ltup), &ExprTup(ref rtup)) => is_exps_equal(cx, ltup, rtup, ignore_fn), + (&ExprTupField(ref le, li), &ExprTupField(ref re, ri)) => { + li.node == ri.node && is_exp_equal(cx, le, re, ignore_fn) + } + (&ExprUnary(lop, ref le), &ExprUnary(rop, ref re)) => { + lop == rop && is_exp_equal(cx, le, re, ignore_fn) + } + (&ExprVec(ref l), &ExprVec(ref r)) => is_exps_equal(cx, l, r, ignore_fn), + (&ExprWhile(ref lc, ref lb, ref ll), &ExprWhile(ref rc, ref rb, ref rl)) => { + is_exp_equal(cx, lc, rc, ignore_fn) && + is_block_equal(cx, lb, rb, ignore_fn) && + both(ll, rl, |l, r| l.name.as_str() == r.name.as_str()) + } _ => false, } } -fn is_exps_equal(cx: &LateContext, left: &[P], right: &[P]) -> bool { - over(left, right, |l, r| is_exp_equal(cx, l, r)) +fn is_exps_equal(cx: &LateContext, left: &[P], right: &[P], ignore_fn: bool) -> bool { + over(left, right, |l, r| is_exp_equal(cx, l, r, ignore_fn)) } fn is_path_equal(left: &Path, right: &Path) -> bool { @@ -620,20 +774,22 @@ fn is_path_equal(left: &Path, right: &Path) -> bool { left.global == right.global && over(&left.segments, &right.segments, - |l, r| l.identifier.name == r.identifier.name && l.parameters == r.parameters) + |l, r| l.identifier.name.as_str() == r.identifier.name.as_str() && l.parameters == r.parameters) } fn is_qself_equal(left: &QSelf, right: &QSelf) -> bool { left.ty.node == right.ty.node && left.position == right.position } -fn over(left: &[X], right: &[X], mut eq_fn: F) -> bool +/// Check if two slices are equal as per `eq_fn`. +pub fn over(left: &[X], right: &[X], mut eq_fn: F) -> bool where F: FnMut(&X, &X) -> bool { left.len() == right.len() && left.iter().zip(right).all(|(x, y)| eq_fn(x, y)) } -fn both(l: &Option, r: &Option, mut eq_fn: F) -> bool +/// Check if the two `Option`s are both `None` or some equal values as per `eq_fn`. +pub fn both(l: &Option, r: &Option, mut eq_fn: F) -> bool where F: FnMut(&X, &X) -> bool { l.as_ref().map_or_else(|| r.is_none(), |x| r.as_ref().map_or(false, |y| eq_fn(x, y))) diff --git a/tests/compile-fail/copies.rs b/tests/compile-fail/copies.rs new file mode 100755 index 000000000000..0f57b619ccc8 --- /dev/null +++ b/tests/compile-fail/copies.rs @@ -0,0 +1,135 @@ +#![feature(plugin)] +#![plugin(clippy)] + +#![allow(dead_code)] +#![allow(let_and_return)] +#![allow(needless_return)] +#![allow(unused_variables)] +#![deny(if_same_then_else)] +#![deny(ifs_same_cond)] + +fn foo() -> bool { unimplemented!() } + +fn if_same_then_else() -> &'static str { + if true { //~ERROR this if has the same then and else blocks + foo(); + } + else { + foo(); + } + + if true { + foo(); + foo(); + } + else { + foo(); + } + + let _ = if true { //~ERROR this if has the same then and else blocks + foo(); + 42 + } + else { + foo(); + 42 + }; + + if true { + foo(); + } + + let _ = if true { //~ERROR this if has the same then and else blocks + 42 + } + else { + 42 + }; + + if true { //~ERROR this if has the same then and else blocks + let bar = if true { + 42 + } + else { + 43 + }; + + while foo() { break; } + bar + 1; + } + else { + let bar = if true { + 42 + } + else { + 43 + }; + + while foo() { break; } + bar + 1; + } + + if true { //~ERROR this if has the same then and else blocks + match 42 { + 42 => (), + a if a > 0 => (), + 10...15 => (), + _ => (), + } + } + else { + match 42 { + 42 => (), + a if a > 0 => (), + 10...15 => (), + _ => (), + } + } + + if true { //~ERROR this if has the same then and else blocks + if let Some(a) = Some(42) {} + } + else { + if let Some(a) = Some(42) {} + } + + if true { //~ERROR this if has the same then and else blocks + let foo = ""; + return &foo[0..]; + } + else { + let foo = ""; + return &foo[0..]; + } +} + +fn ifs_same_cond() { + let a = 0; + + if a == 1 { + } + else if a == 1 { //~ERROR this if has the same condition as a previous if + } + + if 2*a == 1 { + } + else if 2*a == 2 { + } + else if 2*a == 1 { //~ERROR this if has the same condition as a previous if + } + else if a == 1 { + } + + let mut v = vec![1]; + if v.pop() == None { // ok, functions + } + else if v.pop() == None { + } + + if v.len() == 42 { // ok, functions + } + else if v.len() == 42 { + } +} + +fn main() {} diff --git a/tests/compile-fail/eq_op.rs b/tests/compile-fail/eq_op.rs index fc59c2739a2e..7be5ef11ce6a 100644 --- a/tests/compile-fail/eq_op.rs +++ b/tests/compile-fail/eq_op.rs @@ -19,9 +19,9 @@ fn main() { // unary and binary operators (-(2) < -(2)); //~ERROR equal expressions ((1 + 1) & (1 + 1) == (1 + 1) & (1 + 1)); - //~^ ERROR equal expressions - //~^^ ERROR equal expressions - //~^^^ ERROR equal expressions + //~^ ERROR equal expressions as operands to `==` + //~^^ ERROR equal expressions as operands to `&` + //~^^^ ERROR equal expressions as operands to `&` (1 * 2) + (3 * 4) == 1 * 2 + 3 * 4; //~ERROR equal expressions // various other things @@ -31,5 +31,16 @@ fn main() { // const folding 1 + 1 == 2; //~ERROR equal expressions - 1 - 1 == 0; //~ERROR equal expressions + 1 - 1 == 0; //~ERROR equal expressions as operands to `==` + //~^ ERROR equal expressions as operands to `-` + + 1 - 1; //~ERROR equal expressions + 1 / 1; //~ERROR equal expressions + true && true; //~ERROR equal expressions + true || true; //~ERROR equal expressions + + let mut a = vec![1]; + a == a; //~ERROR equal expressions + 2*a.len() == 2*a.len(); // ok, functions + a.pop() == a.pop(); // ok, functions } diff --git a/tests/compile-fail/identity_op.rs b/tests/compile-fail/identity_op.rs index 54551852d5e1..c1141e0b460f 100644 --- a/tests/compile-fail/identity_op.rs +++ b/tests/compile-fail/identity_op.rs @@ -5,6 +5,7 @@ const ONE : i64 = 1; const NEG_ONE : i64 = -1; const ZERO : i64 = 0; +#[allow(eq_op)] #[deny(identity_op)] fn main() { let x = 0; diff --git a/tests/compile-fail/needless_bool.rs b/tests/compile-fail/needless_bool.rs index 39fdf6353fd0..c2ad24bc4eee 100644 --- a/tests/compile-fail/needless_bool.rs +++ b/tests/compile-fail/needless_bool.rs @@ -1,6 +1,7 @@ #![feature(plugin)] #![plugin(clippy)] +#[allow(if_same_then_else)] #[deny(needless_bool)] fn main() { let x = true; diff --git a/tests/compile-fail/zero_div_zero.rs b/tests/compile-fail/zero_div_zero.rs index 8c40923d3ed1..c422e83873b0 100644 --- a/tests/compile-fail/zero_div_zero.rs +++ b/tests/compile-fail/zero_div_zero.rs @@ -5,9 +5,13 @@ #[deny(zero_divided_by_zero)] fn main() { let nan = 0.0 / 0.0; //~ERROR constant division of 0.0 with 0.0 will always result in NaN + //~^ equal expressions as operands to `/` let f64_nan = 0.0 / 0.0f64; //~ERROR constant division of 0.0 with 0.0 will always result in NaN + //~^ equal expressions as operands to `/` let other_f64_nan = 0.0f64 / 0.0; //~ERROR constant division of 0.0 with 0.0 will always result in NaN + //~^ equal expressions as operands to `/` let one_more_f64_nan = 0.0f64/0.0f64; //~ERROR constant division of 0.0 with 0.0 will always result in NaN + //~^ equal expressions as operands to `/` let zero = 0.0; let other_zero = 0.0; let other_nan = zero / other_zero; // fine - this lint doesn't propegate constants.