X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=clippy_lints%2Fsrc%2Farithmetic.rs;h=7653ba43459f2db068f24be9a778f71b2d65745c;hb=6d1225981177587fbb68d9c4902c770c3dbaafb0;hp=d94cd668bddc6db21adf6a29fb0bef2052ecaba3;hpb=f5b107ef6f09365723b5d9db66aeef95fce19097;p=rust.git diff --git a/clippy_lints/src/arithmetic.rs b/clippy_lints/src/arithmetic.rs index d94cd668bdd..7653ba43459 100644 --- a/clippy_lints/src/arithmetic.rs +++ b/clippy_lints/src/arithmetic.rs @@ -1,8 +1,9 @@ use crate::consts::constant_simple; use crate::utils::span_lint; use rustc::hir; +use rustc::impl_lint_pass; use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; -use rustc::{declare_tool_lint, impl_lint_pass}; +use rustc_session::declare_tool_lint; use syntax::source_map::Span; declare_clippy_lint! { @@ -16,7 +17,8 @@ /// /// **Example:** /// ```rust - /// a + 1 + /// # let a = 0; + /// a + 1; /// ``` pub INTEGER_ARITHMETIC, restriction, @@ -33,7 +35,8 @@ /// /// **Example:** /// ```rust - /// a + 1.0 + /// # let a = 0.0; + /// a + 1.0; /// ``` pub FLOAT_ARITHMETIC, restriction, @@ -61,8 +64,8 @@ fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx hir::Expr) { return; } } - match &expr.node { - hir::ExprKind::Binary(op, l, r) => { + match &expr.kind { + hir::ExprKind::Binary(op, l, r) | hir::ExprKind::AssignOp(op, l, r) => { match op.node { hir::BinOpKind::And | hir::BinOpKind::Or @@ -90,14 +93,14 @@ fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx hir::Expr) { }, hir::ExprKind::Unary(hir::UnOp::UnNeg, arg) => { let ty = cx.tables.expr_ty(arg); - if ty.is_integral() { - if constant_simple(cx, cx.tables, expr).is_none() { + if constant_simple(cx, cx.tables, expr).is_none() { + if ty.is_integral() { span_lint(cx, INTEGER_ARITHMETIC, expr.span, "integer arithmetic detected"); self.expr_span = Some(expr.span); + } else if ty.is_floating_point() { + span_lint(cx, FLOAT_ARITHMETIC, expr.span, "floating-point arithmetic detected"); + self.expr_span = Some(expr.span); } - } else if ty.is_floating_point() { - span_lint(cx, FLOAT_ARITHMETIC, expr.span, "floating-point arithmetic detected"); - self.expr_span = Some(expr.span); } }, _ => (), @@ -110,7 +113,7 @@ fn check_expr_post(&mut self, _: &LateContext<'a, 'tcx>, expr: &'tcx hir::Expr) } } - fn check_body(&mut self, cx: &LateContext<'_, '_>, body: &hir::Body) { + fn check_body(&mut self, cx: &LateContext<'_, '_>, body: &hir::Body<'_>) { let body_owner = cx.tcx.hir().body_owner(body.id()); match cx.tcx.hir().body_owner_kind(body_owner) { @@ -128,7 +131,7 @@ fn check_body(&mut self, cx: &LateContext<'_, '_>, body: &hir::Body) { } } - fn check_body_post(&mut self, cx: &LateContext<'_, '_>, body: &hir::Body) { + fn check_body_post(&mut self, cx: &LateContext<'_, '_>, body: &hir::Body<'_>) { let body_owner = cx.tcx.hir().body_owner(body.id()); let body_span = cx.tcx.hir().span(body_owner);