+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.
///
/// ```rust
/// a + 1
/// ```
-declare_restriction_lint! {
+declare_clippy_lint! {
pub INTEGER_ARITHMETIC,
+ restriction,
"any integer arithmetic statement"
}
/// ```rust
/// a + 1.0
/// ```
-declare_restriction_lint! {
+declare_clippy_lint! {
pub FLOAT_ARITHMETIC,
+ restriction,
"any floating-point arithmetic statement"
}
}
}
-impl LateLintPass for Arithmetic {
- fn check_expr(&mut self, cx: &LateContext, expr: &hir::Expr) {
+impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Arithmetic {
+ fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx hir::Expr) {
if self.span.is_some() {
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.tcx.expr_ty(l), cx.tcx.expr_ty(r));
+ let (l_ty, r_ty) = (cx.tables.expr_ty(l), cx.tables.expr_ty(r));
if l_ty.is_integral() && r_ty.is_integral() {
span_lint(cx, INTEGER_ARITHMETIC, expr.span, "integer arithmetic detected");
self.span = Some(expr.span);
span_lint(cx, FLOAT_ARITHMETIC, expr.span, "floating-point arithmetic detected");
self.span = Some(expr.span);
}
- }
- hir::ExprUnary(hir::UnOp::UnNeg, ref arg) => {
- let ty = cx.tcx.expr_ty(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");
self.span = Some(expr.span);
span_lint(cx, FLOAT_ARITHMETIC, expr.span, "floating-point arithmetic detected");
self.span = Some(expr.span);
}
- }
+ },
_ => (),
}
}
- fn check_expr_post(&mut self, _: &LateContext, expr: &hir::Expr) {
+ fn check_expr_post(&mut self, _: &LateContext<'a, 'tcx>, expr: &'tcx hir::Expr) {
if Some(expr.span) == self.span {
self.span = None;
}