-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
45 changed files
with
648 additions
and
239 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,158 @@ | ||
| use clippy_config::msrvs::{self, Msrv}; | ||
| use clippy_utils::diagnostics::span_lint_and_sugg; | ||
| use clippy_utils::source::snippet_with_applicability; | ||
| use clippy_utils::sugg::Sugg; | ||
| use clippy_utils::SpanlessEq; | ||
| use rustc_ast::{BinOpKind, LitKind}; | ||
| use rustc_data_structures::packed::Pu128; | ||
| use rustc_errors::Applicability; | ||
| use rustc_hir::{Expr, ExprKind}; | ||
| use rustc_lint::{LateContext, LateLintPass}; | ||
| use rustc_middle::ty::{self}; | ||
| use rustc_session::impl_lint_pass; | ||
| use rustc_span::symbol::Symbol; | ||
|
|
||
| use clippy_config::Conf; | ||
|
|
||
| declare_clippy_lint! { | ||
| /// ### What it does | ||
| /// Checks for an expression like `(x + (y - 1)) / y` which is a common manual reimplementation | ||
| /// of `x.div_ceil(y)`. | ||
| /// | ||
| /// ### Why is this bad? | ||
| /// It's simpler, clearer and more readable. | ||
| /// | ||
| /// ### Example | ||
| /// ```no_run | ||
| /// let x: i32 = 7; | ||
| /// let y: i32 = 4; | ||
| /// let div = (x + (y - 1)) / y; | ||
| /// ``` | ||
| /// Use instead: | ||
| /// ```no_run | ||
| /// #![feature(int_roundings)] | ||
| /// let x: i32 = 7; | ||
| /// let y: i32 = 4; | ||
| /// let div = x.div_ceil(y); | ||
| /// ``` | ||
| #[clippy::version = "1.81.0"] | ||
| pub MANUAL_DIV_CEIL, | ||
| complexity, | ||
| "manually reimplementing `div_ceil`" | ||
| } | ||
|
|
||
| pub struct ManualDivCeil { | ||
| msrv: Msrv, | ||
| } | ||
|
|
||
| impl ManualDivCeil { | ||
| #[must_use] | ||
| pub fn new(conf: &'static Conf) -> Self { | ||
| Self { | ||
| msrv: conf.msrv.clone(), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl_lint_pass!(ManualDivCeil => [MANUAL_DIV_CEIL]); | ||
|
|
||
| impl<'tcx> LateLintPass<'tcx> for ManualDivCeil { | ||
| fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &Expr<'_>) { | ||
| if !self.msrv.meets(msrvs::MANUAL_DIV_CEIL) { | ||
| return; | ||
| } | ||
|
|
||
| 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) | ||
| && let ExprKind::Binary(inner_op, inner_lhs, inner_rhs) = div_lhs.kind | ||
| { | ||
| // (x + (y - 1)) / y | ||
| 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, inner_lhs, div_rhs, &mut applicability); | ||
| return; | ||
| } | ||
|
|
||
| // ((y - 1) + x) / y | ||
| 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, inner_rhs, div_rhs, &mut applicability); | ||
| return; | ||
| } | ||
|
|
||
| // (x + y - 1) / y | ||
| 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(inner_rhs) | ||
| && check_eq_expr(cx, add_rhs, div_rhs) | ||
| { | ||
| build_suggestion(cx, expr, add_lhs, div_rhs, &mut applicability); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| extract_msrv_attr!(LateContext); | ||
| } | ||
|
|
||
| fn check_int_ty_and_feature(cx: &LateContext<'_>, expr: &Expr<'_>) -> bool { | ||
| let expr_ty = cx.typeck_results().expr_ty(expr); | ||
| match expr_ty.peel_refs().kind() { | ||
| ty::Uint(_) => true, | ||
| ty::Int(_) => cx | ||
| .tcx | ||
| .features() | ||
| .declared_features | ||
| .contains(&Symbol::intern("int_roundings")), | ||
|
|
||
| _ => false, | ||
| } | ||
| } | ||
|
|
||
| fn check_literal(expr: &Expr<'_>) -> bool { | ||
| if let ExprKind::Lit(lit) = expr.kind | ||
| && let LitKind::Int(Pu128(1), _) = lit.node | ||
| { | ||
| return true; | ||
| } | ||
| false | ||
| } | ||
|
|
||
| fn check_eq_expr(cx: &LateContext<'_>, lhs: &Expr<'_>, rhs: &Expr<'_>) -> bool { | ||
| SpanlessEq::new(cx).eq_expr(lhs, rhs) | ||
| } | ||
|
|
||
| fn build_suggestion( | ||
| cx: &LateContext<'_>, | ||
| expr: &Expr<'_>, | ||
| lhs: &Expr<'_>, | ||
| rhs: &Expr<'_>, | ||
| applicability: &mut Applicability, | ||
| ) { | ||
| let dividend_sugg = Sugg::hir_with_applicability(cx, lhs, "..", applicability).maybe_par(); | ||
| let divisor_snippet = snippet_with_applicability(cx, rhs.span.source_callsite(), "..", applicability); | ||
|
|
||
| let sugg = format!("{dividend_sugg}.div_ceil({divisor_snippet})"); | ||
|
|
||
| span_lint_and_sugg( | ||
| cx, | ||
| MANUAL_DIV_CEIL, | ||
| expr.span, | ||
| "manually reimplementing `div_ceil`", | ||
| "consider using `.div_ceil()`", | ||
| sugg, | ||
| *applicability, | ||
| ); | ||
| } |
Oops, something went wrong.