Skip to content

clean-up modulo_arithmetic #14898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 30, 2025
Merged

clean-up modulo_arithmetic #14898

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
93a509f
exhaustive match instead of returns
ada4a May 25, 2025
b72cb48
use ?
ada4a May 25, 2025
f04eb59
use if-let
ada4a May 25, 2025
028e1c2
use let-chains
ada4a May 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 17 additions & 28 deletions clippy_lints/src/operators/modulo_arithmetic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,10 @@ pub(super) fn check<'tcx>(
}

fn used_in_comparison_with_zero(cx: &LateContext<'_>, expr: &Expr<'_>) -> bool {
let Node::Expr(parent_expr) = cx.tcx.parent_hir_node(expr.hir_id) else {
return false;
};
let ExprKind::Binary(op, lhs, rhs) = parent_expr.kind else {
return false;
};

if op.node == BinOpKind::Eq || op.node == BinOpKind::Ne {
if let Node::Expr(parent_expr) = cx.tcx.parent_hir_node(expr.hir_id)
&& let ExprKind::Binary(op, lhs, rhs) = parent_expr.kind
&& let BinOpKind::Eq | BinOpKind::Ne = op.node
{
let ecx = ConstEvalCtxt::new(cx);
matches!(ecx.eval(lhs), Some(Constant::Int(0))) || matches!(ecx.eval(rhs), Some(Constant::Int(0)))
} else {
Expand All @@ -56,35 +52,28 @@ struct OperandInfo {
}

fn analyze_operand(operand: &Expr<'_>, cx: &LateContext<'_>, expr: &Expr<'_>) -> Option<OperandInfo> {
match ConstEvalCtxt::new(cx).eval(operand) {
Some(Constant::Int(v)) => match *cx.typeck_results().expr_ty(expr).kind() {
match ConstEvalCtxt::new(cx).eval(operand)? {
Constant::Int(v) => match *cx.typeck_results().expr_ty(expr).kind() {
ty::Int(ity) => {
let value = sext(cx.tcx, v, ity);
return Some(OperandInfo {
Some(OperandInfo {
string_representation: Some(value.to_string()),
is_negative: value < 0,
is_integral: true,
});
},
ty::Uint(_) => {
return Some(OperandInfo {
string_representation: None,
is_negative: false,
is_integral: true,
});
})
},
_ => {},
ty::Uint(_) => Some(OperandInfo {
string_representation: None,
is_negative: false,
is_integral: true,
}),
_ => None,
},
// FIXME(f16_f128): add when casting is available on all platforms
Some(Constant::F32(f)) => {
return Some(floating_point_operand_info(&f));
},
Some(Constant::F64(f)) => {
return Some(floating_point_operand_info(&f));
},
_ => {},
Constant::F32(f) => Some(floating_point_operand_info(&f)),
Constant::F64(f) => Some(floating_point_operand_info(&f)),
_ => None,
}
None
}

fn floating_point_operand_info<T: Display + PartialOrd + From<f32>>(f: &T) -> OperandInfo {
Expand Down