Merge pull request #2291 from DarrenTsung/fix_2265

Fix #2265, ignore eq_op lint in macro invocation
This commit is contained in:
Oliver Schneider 2017-12-23 01:06:44 +01:00 committed by GitHub
commit f0d0fc69de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 2 deletions

View File

@ -1,6 +1,6 @@
use rustc::hir::*;
use rustc::lint::*;
use utils::{implements_trait, is_copy, multispan_sugg, snippet, span_lint, span_lint_and_then, SpanlessEq};
use utils::{in_macro, implements_trait, is_copy, multispan_sugg, snippet, span_lint, span_lint_and_then, SpanlessEq};
/// **What it does:** Checks for equal operands to comparison, logical and
/// bitwise, difference and division binary operators (`==`, `>`, etc., `&&`,
@ -53,7 +53,7 @@ impl LintPass for EqOp {
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for EqOp {
fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, e: &'tcx Expr) {
if let ExprBinary(ref op, ref left, ref right) = e.node {
if is_valid_operator(op) && SpanlessEq::new(cx).ignore_fn().eq_expr(left, right) {
if is_valid_operator(op) && SpanlessEq::new(cx).ignore_fn().eq_expr(left, right) && !in_macro(e.span) {
span_lint(
cx,
EQ_OP,

View File

@ -87,4 +87,20 @@ fn main() {
let x = Y(1);
let y = Y(2);
let z = x & &y;
check_ignore_macro();
}
macro_rules! check_if_named_foo {
($expression:expr) => (
if stringify!($expression) == "foo" {
println!("foo!");
} else {
println!("not foo.");
}
)
}
fn check_ignore_macro() {
check_if_named_foo!(foo);
}