Merge branch 'macro-use' into HEAD

[rust.git] / clippy_lints / src / arithmetic.rs

diff --git a/clippy_lints/src/arithmetic.rs b/clippy_lints/src/arithmetic.rs
index a551ebf046bd41c325bd60a9ade9454dedb54a2e..b3d78d2d13f7951c3a9eb8138494b8c4dd9fd0f6 100644 (file)
--- a/clippy_lints/src/arithmetic.rs
+++ b/clippy_lints/src/arithmetic.rs
@@ -1,7 +1,8 @@
+use crate::utils::span_lint;
 use rustc::hir;
 use rustc::lint::*;
+use rustc::{declare_lint, lint_array};
 use syntax::codemap::Span;
-use utils::span_lint;
 
 /// **What it does:** Checks for plain integer arithmetic.
 ///
@@ -15,8 +16,9 @@
 /// ```rust
 /// a + 1
 /// ```
-declare_restriction_lint! {
+declare_clippy_lint! {
     pub INTEGER_ARITHMETIC,
+    restriction,
     "any integer arithmetic statement"
 }
 
@@ -31,8 +33,9 @@
 /// ```rust
 /// a + 1.0
 /// ```
-declare_restriction_lint! {
+declare_clippy_lint! {
     pub FLOAT_ARITHMETIC,
+    restriction,
     "any floating-point arithmetic statement"
 }
 
@@ -53,21 +56,21 @@ fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx hir::Expr) {
             return;
         }
         match expr.node {
-            hir::ExprBinary(ref op, ref l, ref r) => {
+            hir::ExprKind::Binary(ref op, ref l, ref r) => {
                 match op.node {
-                    hir::BiAnd |
-                    hir::BiOr |
-                    hir::BiBitAnd |
-                    hir::BiBitOr |
-                    hir::BiBitXor |
-                    hir::BiShl |
-                    hir::BiShr |
-                    hir::BiEq |
-                    hir::BiLt |
-                    hir::BiLe |
-                    hir::BiNe |
-                    hir::BiGe |
-                    hir::BiGt => return,
+                    hir::BinOpKind::And
+                    | hir::BinOpKind::Or
+                    | hir::BinOpKind::BitAnd
+                    | hir::BinOpKind::BitOr
+                    | hir::BinOpKind::BitXor
+                    | hir::BinOpKind::Shl
+                    | hir::BinOpKind::Shr
+                    | hir::BinOpKind::Eq
+                    | hir::BinOpKind::Lt
+                    | hir::BinOpKind::Le
+                    | hir::BinOpKind::Ne
+                    | hir::BinOpKind::Ge
+                    | hir::BinOpKind::Gt => return,
                     _ => (),
                 }
                 let (l_ty, r_ty) = (cx.tables.expr_ty(l), cx.tables.expr_ty(r));
@@ -79,7 +82,7 @@ fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx hir::Expr) {
                     self.span = Some(expr.span);
                 }
             },
-            hir::ExprUnary(hir::UnOp::UnNeg, ref arg) => {
+            hir::ExprKind::Unary(hir::UnOp::UnNeg, ref arg) => {
                 let ty = cx.tables.expr_ty(arg);
                 if ty.is_integral() {
                     span_lint(cx, INTEGER_ARITHMETIC, expr.span, "integer arithmetic detected");