This commit is contained in:
Alex Ozdemir 2021-12-28 08:19:47 -08:00
parent ba70842c62
commit bc0579f5bf
3 changed files with 34 additions and 14 deletions

View file

@ -62,8 +62,8 @@ impl<'tcx> LateLintPass<'tcx> for IdentityOp {
fn is_allowed(cx: &LateContext<'_>, cmp: BinOp, left: &Expr<'_>, right: &Expr<'_>) -> bool { fn is_allowed(cx: &LateContext<'_>, cmp: BinOp, left: &Expr<'_>, right: &Expr<'_>) -> bool {
// This lint applies to integers // This lint applies to integers
!cx.typeck_results().expr_ty(left).is_integral() !cx.typeck_results().expr_ty(left).peel_refs().is_integral()
|| !cx.typeck_results().expr_ty(right).is_integral() || !cx.typeck_results().expr_ty(right).peel_refs().is_integral()
// `1 << 0` is a common pattern in bit manipulation code // `1 << 0` is a common pattern in bit manipulation code
|| (cmp.node == BinOpKind::Shl || (cmp.node == BinOpKind::Shl
&& constant_simple(cx, cx.typeck_results(), right) == Some(Constant::Int(0)) && constant_simple(cx, cx.typeck_results(), right) == Some(Constant::Int(0))

View file

@ -2,6 +2,16 @@ const ONE: i64 = 1;
const NEG_ONE: i64 = -1; const NEG_ONE: i64 = -1;
const ZERO: i64 = 0; const ZERO: i64 = 0;
struct A(String);
impl std::ops::Shl<i32> for A {
type Output = A;
fn shl(mut self, other: i32) -> Self {
self.0.push_str(&format!("{}", other));
self
}
}
#[allow( #[allow(
clippy::eq_op, clippy::eq_op,
clippy::no_effect, clippy::no_effect,
@ -38,4 +48,8 @@ fn main() {
42 << 0; 42 << 0;
1 >> 0; 1 >> 0;
42 >> 0; 42 >> 0;
&x >> 0;
let mut a = A("".into());
let b = a << 0; // no error: non-integer
} }

View file

@ -1,5 +1,5 @@
error: the operation is ineffective. Consider reducing it to `x` error: the operation is ineffective. Consider reducing it to `x`
--> $DIR/identity_op.rs:16:5 --> $DIR/identity_op.rs:26:5
| |
LL | x + 0; LL | x + 0;
| ^^^^^ | ^^^^^
@ -7,64 +7,70 @@ LL | x + 0;
= note: `-D clippy::identity-op` implied by `-D warnings` = note: `-D clippy::identity-op` implied by `-D warnings`
error: the operation is ineffective. Consider reducing it to `x` error: the operation is ineffective. Consider reducing it to `x`
--> $DIR/identity_op.rs:17:5 --> $DIR/identity_op.rs:27:5
| |
LL | x + (1 - 1); LL | x + (1 - 1);
| ^^^^^^^^^^^ | ^^^^^^^^^^^
error: the operation is ineffective. Consider reducing it to `x` error: the operation is ineffective. Consider reducing it to `x`
--> $DIR/identity_op.rs:19:5 --> $DIR/identity_op.rs:29:5
| |
LL | 0 + x; LL | 0 + x;
| ^^^^^ | ^^^^^
error: the operation is ineffective. Consider reducing it to `x` error: the operation is ineffective. Consider reducing it to `x`
--> $DIR/identity_op.rs:22:5 --> $DIR/identity_op.rs:32:5
| |
LL | x | (0); LL | x | (0);
| ^^^^^^^ | ^^^^^^^
error: the operation is ineffective. Consider reducing it to `x` error: the operation is ineffective. Consider reducing it to `x`
--> $DIR/identity_op.rs:25:5 --> $DIR/identity_op.rs:35:5
| |
LL | x * 1; LL | x * 1;
| ^^^^^ | ^^^^^
error: the operation is ineffective. Consider reducing it to `x` error: the operation is ineffective. Consider reducing it to `x`
--> $DIR/identity_op.rs:26:5 --> $DIR/identity_op.rs:36:5
| |
LL | 1 * x; LL | 1 * x;
| ^^^^^ | ^^^^^
error: the operation is ineffective. Consider reducing it to `x` error: the operation is ineffective. Consider reducing it to `x`
--> $DIR/identity_op.rs:32:5 --> $DIR/identity_op.rs:42:5
| |
LL | -1 & x; LL | -1 & x;
| ^^^^^^ | ^^^^^^
error: the operation is ineffective. Consider reducing it to `u` error: the operation is ineffective. Consider reducing it to `u`
--> $DIR/identity_op.rs:35:5 --> $DIR/identity_op.rs:45:5
| |
LL | u & 255; LL | u & 255;
| ^^^^^^^ | ^^^^^^^
error: the operation is ineffective. Consider reducing it to `42` error: the operation is ineffective. Consider reducing it to `42`
--> $DIR/identity_op.rs:38:5 --> $DIR/identity_op.rs:48:5
| |
LL | 42 << 0; LL | 42 << 0;
| ^^^^^^^ | ^^^^^^^
error: the operation is ineffective. Consider reducing it to `1` error: the operation is ineffective. Consider reducing it to `1`
--> $DIR/identity_op.rs:39:5 --> $DIR/identity_op.rs:49:5
| |
LL | 1 >> 0; LL | 1 >> 0;
| ^^^^^^ | ^^^^^^
error: the operation is ineffective. Consider reducing it to `42` error: the operation is ineffective. Consider reducing it to `42`
--> $DIR/identity_op.rs:40:5 --> $DIR/identity_op.rs:50:5
| |
LL | 42 >> 0; LL | 42 >> 0;
| ^^^^^^^ | ^^^^^^^
error: aborting due to 11 previous errors error: the operation is ineffective. Consider reducing it to `&x`
--> $DIR/identity_op.rs:51:5
|
LL | &x >> 0;
| ^^^^^^^
error: aborting due to 12 previous errors