contants peel_refs to catch x << &0

This commit is contained in:
Alex Ozdemir 2021-12-28 08:32:55 -08:00
parent bc0579f5bf
commit ee6d5c5cda
4 changed files with 19 additions and 4 deletions

View file

@ -71,8 +71,8 @@ fn is_allowed(cx: &LateContext<'_>, cmp: BinOp, left: &Expr<'_>, right: &Expr<'_
} }
fn check(cx: &LateContext<'_>, e: &Expr<'_>, m: i8, span: Span, arg: Span) { fn check(cx: &LateContext<'_>, e: &Expr<'_>, m: i8, span: Span, arg: Span) {
if let Some(Constant::Int(v)) = constant_simple(cx, cx.typeck_results(), e) { if let Some(Constant::Int(v)) = constant_simple(cx, cx.typeck_results(), e).map(Constant::peel_refs) {
let check = match *cx.typeck_results().expr_ty(e).kind() { let check = match *cx.typeck_results().expr_ty(e).peel_refs().kind() {
ty::Int(ity) => unsext(cx.tcx, -1_i128, ity), ty::Int(ity) => unsext(cx.tcx, -1_i128, ity),
ty::Uint(uty) => clip(cx.tcx, !0, uty), ty::Uint(uty) => clip(cx.tcx, !0, uty),
_ => return, _ => return,

View file

@ -168,6 +168,14 @@ impl Constant {
None None
} }
} }
#[must_use]
pub fn peel_refs(mut self) -> Self {
while let Constant::Ref(r) = self {
self = *r;
}
self
}
} }
/// Parses a `LitKind` to a `Constant`. /// Parses a `LitKind` to a `Constant`.

View file

@ -11,11 +11,11 @@ impl std::ops::Shl<i32> for A {
self self
} }
} }
#[allow( #[allow(
clippy::eq_op, clippy::eq_op,
clippy::no_effect, clippy::no_effect,
clippy::unnecessary_operation, clippy::unnecessary_operation,
clippy::op_ref,
clippy::double_parens clippy::double_parens
)] )]
#[warn(clippy::identity_op)] #[warn(clippy::identity_op)]
@ -49,6 +49,7 @@ fn main() {
1 >> 0; 1 >> 0;
42 >> 0; 42 >> 0;
&x >> 0; &x >> 0;
x >> &0;
let mut a = A("".into()); let mut a = A("".into());
let b = a << 0; // no error: non-integer let b = a << 0; // no error: non-integer

View file

@ -72,5 +72,11 @@ error: the operation is ineffective. Consider reducing it to `&x`
LL | &x >> 0; LL | &x >> 0;
| ^^^^^^^ | ^^^^^^^
error: aborting due to 12 previous errors error: the operation is ineffective. Consider reducing it to `x`
--> $DIR/identity_op.rs:52:5
|
LL | x >> &0;
| ^^^^^^^
error: aborting due to 13 previous errors