From 0c74304f7b4351d6fb27b9c206ec25476c0228f3 Mon Sep 17 00:00:00 2001
From: Andre Bogus <bogusandre@gmail.com>
Date: Sun, 6 Sep 2015 19:41:09 +0200
Subject: [PATCH 1/2] macro check for unit_cmp

---
 src/types.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/types.rs b/src/types.rs
index 44c0cd78148..6586ce2c703 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -85,6 +85,7 @@ impl LintPass for UnitCmp {
     }
 
     fn check_expr(&mut self, cx: &Context, expr: &Expr) {
+        if in_macro(expr) { return; }
         if let ExprBinary(ref cmp, ref left, _) = expr.node {
             let op = cmp.node;
             let sty = &cx.tcx.expr_ty(left).sty;

From 391a5135e88afe2e6f86319db45b96262f350c4d Mon Sep 17 00:00:00 2001
From: Andre Bogus <bogusandre@gmail.com>
Date: Sun, 6 Sep 2015 19:44:54 +0200
Subject: [PATCH 2/2] fixed build

---
 src/types.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types.rs b/src/types.rs
index 6586ce2c703..6d096e18b88 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -85,7 +85,7 @@ impl LintPass for UnitCmp {
     }
 
     fn check_expr(&mut self, cx: &Context, expr: &Expr) {
-        if in_macro(expr) { return; }
+        if in_macro(cx, expr.span) { return; }
         if let ExprBinary(ref cmp, ref left, _) = expr.node {
             let op = cmp.node;
             let sty = &cx.tcx.expr_ty(left).sty;