Refactor manual_div_ceil check to be more concise

Author: belyakov-am

clippy_lints/src/manual_div_ceil.rs

@@ -61,40 +61,38 @@ impl<'tcx> LateLintPass<'tcx> for ManualDivCeil {
         let mut applicability = Applicability::MachineApplicable;
 
         if let ExprKind::Binary(div_op, div_lhs, div_rhs) = expr.kind
+            && div_op.node == BinOpKind::Div
             && check_int_ty_and_feature(cx, div_lhs)
             && check_int_ty_and_feature(cx, div_rhs)
-            && div_op.node == BinOpKind::Div
+            && let ExprKind::Binary(inner_op, inner_lhs, inner_rhs) = div_lhs.kind
         {
             // (x + (y - 1)) / y
-            if let ExprKind::Binary(add_op, add_lhs, add_rhs) = div_lhs.kind
-                && add_op.node == BinOpKind::Add
-                && let ExprKind::Binary(sub_op, sub_lhs, sub_rhs) = add_rhs.kind
+            if let ExprKind::Binary(sub_op, sub_lhs, sub_rhs) = inner_rhs.kind
+                && inner_op.node == BinOpKind::Add
                 && sub_op.node == BinOpKind::Sub
                 && check_literal(sub_rhs)
                 && check_eq_expr(cx, sub_lhs, div_rhs)
             {
-                build_suggestion(cx, expr, add_lhs, div_rhs, &mut applicability);
+                build_suggestion(cx, expr, inner_lhs, div_rhs, &mut applicability);
                 return;
             }
 
             // ((y - 1) + x) / y
-            if let ExprKind::Binary(add_op, add_lhs, add_rhs) = div_lhs.kind
-                && add_op.node == BinOpKind::Add
-                && let ExprKind::Binary(sub_op, sub_lhs, sub_rhs) = add_lhs.kind
+            if let ExprKind::Binary(sub_op, sub_lhs, sub_rhs) = inner_lhs.kind
+                && inner_op.node == BinOpKind::Add
                 && sub_op.node == BinOpKind::Sub
                 && check_literal(sub_rhs)
                 && check_eq_expr(cx, sub_lhs, div_rhs)
             {
-                build_suggestion(cx, expr, add_rhs, div_rhs, &mut applicability);
+                build_suggestion(cx, expr, inner_rhs, div_rhs, &mut applicability);
                 return;
             }
 
             // (x + y - 1) / y
-            if let ExprKind::Binary(sub_op, sub_lhs, sub_rhs) = div_lhs.kind
-                && sub_op.node == BinOpKind::Sub
-                && let ExprKind::Binary(add_op, add_lhs, add_rhs) = sub_lhs.kind
+            if let ExprKind::Binary(add_op, add_lhs, add_rhs) = inner_lhs.kind
+                && inner_op.node == BinOpKind::Sub
                 && add_op.node == BinOpKind::Add
-                && check_literal(sub_rhs)
+                && check_literal(inner_rhs)
                 && check_eq_expr(cx, add_rhs, div_rhs)
             {
                 build_suggestion(cx, expr, add_lhs, div_rhs, &mut applicability);