Skip to content

Commit 7d4ee95

Browse files
c410-f3rc410-f3r
committed
Rename integer_arithmetic 
1 parent 1407c76 commit 7d4ee95

14 files changed

+156
-184
lines changed

‎clippy_lints/src/declared_lints.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,6 @@ pub(crate) static LINTS: &[&crate::LintInfo] = &[
489489
crate::operators::FLOAT_EQUALITY_WITHOUT_ABS_INFO,
490490
crate::operators::IDENTITY_OP_INFO,
491491
crate::operators::INEFFECTIVE_BIT_MASK_INFO,
492-
crate::operators::INTEGER_ARITHMETIC_INFO,
493492
crate::operators::INTEGER_DIVISION_INFO,
494493
crate::operators::MISREFACTORED_ASSIGN_OP_INFO,
495494
crate::operators::MODULO_ARITHMETIC_INFO,

‎clippy_lints/src/operators/mod.rs

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -96,32 +96,6 @@ declare_clippy_lint! {
9696
"any arithmetic expression that can cause side effects like overflows or panics"
9797
}
9898

99-
declare_clippy_lint! {
100-
/// ### What it does
101-
/// Checks for integer arithmetic operations which could overflow or panic.
102-
///
103-
/// Specifically, checks for any operators (`+`, `-`, `*`, `<<`, etc) which are capable
104-
/// of overflowing according to the [Rust
105-
/// Reference](https://doc.rust-lang.org/reference/expressions/operator-expr.html#overflow),
106-
/// or which can panic (`/`, `%`). No bounds analysis or sophisticated reasoning is
107-
/// attempted.
108-
///
109-
/// ### Why is this bad?
110-
/// Integer overflow will trigger a panic in debug builds or will wrap in
111-
/// release mode. Division by zero will cause a panic in either mode. In some applications one
112-
/// wants explicitly checked, wrapping or saturating arithmetic.
113-
///
114-
/// ### Example
115-
/// ```rust
116-
/// # let a = 0;
117-
/// a + 1;
118-
/// ```
119-
#[clippy::version = "pre 1.29.0"]
120-
pub INTEGER_ARITHMETIC,
121-
restriction,
122-
"any integer arithmetic expression which could overflow or panic"
123-
}
124-
12599
declare_clippy_lint! {
126100
/// ### What it does
127101
/// Checks for float arithmetic.
@@ -787,7 +761,6 @@ pub struct Operators {
787761
impl_lint_pass!(Operators => [
788762
ABSURD_EXTREME_COMPARISONS,
789763
ARITHMETIC_SIDE_EFFECTS,
790-
INTEGER_ARITHMETIC,
791764
FLOAT_ARITHMETIC,
792765
ASSIGN_OP_PATTERN,
793766
MISREFACTORED_ASSIGN_OP,

‎clippy_lints/src/operators/numeric_arithmetic.rs

Lines changed: 6 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
use super::{FLOAT_ARITHMETIC, INTEGER_ARITHMETIC};
1+
use super::FLOAT_ARITHMETIC;
22
use clippy_utils::consts::constant_simple;
33
use clippy_utils::diagnostics::span_lint;
4-
use clippy_utils::is_from_proc_macro;
5-
use clippy_utils::is_integer_literal;
64
use rustc_hir as hir;
75
use rustc_lint::LateContext;
86
use rustc_span::source_map::Span;
@@ -45,31 +43,8 @@ impl Context {
4543
_ => (),
4644
}
4745

48-
let (l_ty, r_ty) = (cx.typeck_results().expr_ty(l), cx.typeck_results().expr_ty(r));
49-
if l_ty.peel_refs().is_integral() && r_ty.peel_refs().is_integral() {
50-
if is_from_proc_macro(cx, expr) {
51-
return;
52-
}
53-
match op {
54-
hir::BinOpKind::Div | hir::BinOpKind::Rem => match &r.kind {
55-
hir::ExprKind::Lit(_lit) => (),
56-
hir::ExprKind::Unary(hir::UnOp::Neg, expr) => {
57-
if is_integer_literal(expr, 1) {
58-
span_lint(cx, INTEGER_ARITHMETIC, expr.span, "integer arithmetic detected");
59-
self.expr_id = Some(expr.hir_id);
60-
}
61-
},
62-
_ => {
63-
span_lint(cx, INTEGER_ARITHMETIC, expr.span, "integer arithmetic detected");
64-
self.expr_id = Some(expr.hir_id);
65-
},
66-
},
67-
_ => {
68-
span_lint(cx, INTEGER_ARITHMETIC, expr.span, "integer arithmetic detected");
69-
self.expr_id = Some(expr.hir_id);
70-
},
71-
}
72-
} else if r_ty.peel_refs().is_floating_point() && r_ty.peel_refs().is_floating_point() {
46+
let (_, r_ty) = (cx.typeck_results().expr_ty(l), cx.typeck_results().expr_ty(r));
47+
if r_ty.peel_refs().is_floating_point() && r_ty.peel_refs().is_floating_point() {
7348
span_lint(cx, FLOAT_ARITHMETIC, expr.span, "floating-point arithmetic detected");
7449
self.expr_id = Some(expr.hir_id);
7550
}
@@ -80,17 +55,9 @@ impl Context {
8055
return;
8156
}
8257
let ty = cx.typeck_results().expr_ty(arg);
83-
if constant_simple(cx, cx.typeck_results(), expr).is_none() {
84-
if ty.is_integral() {
85-
if is_from_proc_macro(cx, expr) {
86-
return;
87-
}
88-
span_lint(cx, INTEGER_ARITHMETIC, expr.span, "integer arithmetic detected");
89-
self.expr_id = Some(expr.hir_id);
90-
} else if ty.is_floating_point() {
91-
span_lint(cx, FLOAT_ARITHMETIC, expr.span, "floating-point arithmetic detected");
92-
self.expr_id = Some(expr.hir_id);
93-
}
58+
if constant_simple(cx, cx.typeck_results(), expr).is_none() && ty.is_floating_point() {
59+
span_lint(cx, FLOAT_ARITHMETIC, expr.span, "floating-point arithmetic detected");
60+
self.expr_id = Some(expr.hir_id);
9461
}
9562
}
9663

‎clippy_lints/src/renamed_lints.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ pub static RENAMED_LINTS: &[(&str, &str)] = &[
1515
("clippy::eval_order_dependence", "clippy::mixed_read_write_in_expression"),
1616
("clippy::identity_conversion", "clippy::useless_conversion"),
1717
("clippy::if_let_some_result", "clippy::match_result_ok"),
18+
("clippy::integer_arithmetic", "clippy::arithmetic_side_effects"),
1819
("clippy::logic_bug", "clippy::overly_complex_bool_expr"),
1920
("clippy::new_without_default_derive", "clippy::new_without_default"),
2021
("clippy::option_and_then_some", "clippy::bind_instead_of_map"),

‎tests/ui/float_arithmetic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![warn(clippy::integer_arithmetic, clippy::float_arithmetic)]
1+
#![warn(clippy::arithmetic_side_effects, clippy::float_arithmetic)]
22
#![allow(
33
unused,
44
clippy::shadow_reuse,

‎tests/ui/float_arithmetic.stderr

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,47 +60,91 @@ error: floating-point arithmetic detected
6060
LL | f /= 2.0;
6161
| ^^^^^^^^
6262

63+
error: arithmetic operation that can potentially result in unexpected side-effects
64+
--> $DIR/float_arithmetic.rs:32:5
65+
|
66+
LL | 3.1_f32 + &1.2_f32;
67+
| ^^^^^^^^^^^^^^^^^^
68+
|
69+
= note: `-D clippy::arithmetic-side-effects` implied by `-D warnings`
70+
6371
error: floating-point arithmetic detected
6472
--> $DIR/float_arithmetic.rs:32:5
6573
|
6674
LL | 3.1_f32 + &1.2_f32;
6775
| ^^^^^^^^^^^^^^^^^^
6876

77+
error: arithmetic operation that can potentially result in unexpected side-effects
78+
--> $DIR/float_arithmetic.rs:33:5
79+
|
80+
LL | &3.4_f32 + 1.5_f32;
81+
| ^^^^^^^^^^^^^^^^^^
82+
6983
error: floating-point arithmetic detected
7084
--> $DIR/float_arithmetic.rs:33:5
7185
|
7286
LL | &3.4_f32 + 1.5_f32;
7387
| ^^^^^^^^^^^^^^^^^^
7488

89+
error: arithmetic operation that can potentially result in unexpected side-effects
90+
--> $DIR/float_arithmetic.rs:34:5
91+
|
92+
LL | &3.5_f32 + &1.3_f32;
93+
| ^^^^^^^^^^^^^^^^^^^
94+
7595
error: floating-point arithmetic detected
7696
--> $DIR/float_arithmetic.rs:34:5
7797
|
7898
LL | &3.5_f32 + &1.3_f32;
7999
| ^^^^^^^^^^^^^^^^^^^
80100

101+
error: arithmetic operation that can potentially result in unexpected side-effects
102+
--> $DIR/float_arithmetic.rs:39:5
103+
|
104+
LL | a + f
105+
| ^^^^^
106+
81107
error: floating-point arithmetic detected
82108
--> $DIR/float_arithmetic.rs:39:5
83109
|
84110
LL | a + f
85111
| ^^^^^
86112

113+
error: arithmetic operation that can potentially result in unexpected side-effects
114+
--> $DIR/float_arithmetic.rs:43:5
115+
|
116+
LL | f1 + f2
117+
| ^^^^^^^
118+
87119
error: floating-point arithmetic detected
88120
--> $DIR/float_arithmetic.rs:43:5
89121
|
90122
LL | f1 + f2
91123
| ^^^^^^^
92124

125+
error: arithmetic operation that can potentially result in unexpected side-effects
126+
--> $DIR/float_arithmetic.rs:47:5
127+
|
128+
LL | f1 + f2
129+
| ^^^^^^^
130+
93131
error: floating-point arithmetic detected
94132
--> $DIR/float_arithmetic.rs:47:5
95133
|
96134
LL | f1 + f2
97135
| ^^^^^^^
98136

137+
error: arithmetic operation that can potentially result in unexpected side-effects
138+
--> $DIR/float_arithmetic.rs:51:5
139+
|
140+
LL | (&f1 + &f2)
141+
| ^^^^^^^^^^^
142+
99143
error: floating-point arithmetic detected
100144
--> $DIR/float_arithmetic.rs:51:5
101145
|
102146
LL | (&f1 + &f2)
103147
| ^^^^^^^^^^^
104148

105-
error: aborting due to 17 previous errors
149+
error: aborting due to 24 previous errors
106150

‎tests/ui/integer_arithmetic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@aux-build:proc_macro_derive.rs
22

3-
#![warn(clippy::integer_arithmetic, clippy::float_arithmetic)]
3+
#![warn(clippy::arithmetic_side_effects, clippy::float_arithmetic)]
44
#![allow(clippy::no_effect, clippy::unnecessary_operation, clippy::op_ref)]
55

66
extern crate proc_macro_derive;

0 commit comments

Comments
 (0)