Add MSRV check for saturating_sub
lints in const contexts
This commit is contained in:
parent
d20fc38f0a
commit
e845366c82
@ -35,7 +35,7 @@ macro_rules! msrv_aliases {
|
|||||||
1,52,0 { STR_SPLIT_ONCE, REM_EUCLID_CONST }
|
1,52,0 { STR_SPLIT_ONCE, REM_EUCLID_CONST }
|
||||||
1,51,0 { BORROW_AS_PTR, SEEK_FROM_CURRENT, UNSIGNED_ABS }
|
1,51,0 { BORROW_AS_PTR, SEEK_FROM_CURRENT, UNSIGNED_ABS }
|
||||||
1,50,0 { BOOL_THEN, CLAMP }
|
1,50,0 { BOOL_THEN, CLAMP }
|
||||||
1,47,0 { TAU, IS_ASCII_DIGIT_CONST, ARRAY_IMPL_ANY_LEN }
|
1,47,0 { TAU, IS_ASCII_DIGIT_CONST, ARRAY_IMPL_ANY_LEN, SATURATING_SUB_CONST }
|
||||||
1,46,0 { CONST_IF_MATCH }
|
1,46,0 { CONST_IF_MATCH }
|
||||||
1,45,0 { STR_STRIP_PREFIX }
|
1,45,0 { STR_STRIP_PREFIX }
|
||||||
1,43,0 { LOG2_10, LOG10_2, NUMERIC_ASSOCIATED_CONSTANTS }
|
1,43,0 { LOG2_10, LOG10_2, NUMERIC_ASSOCIATED_CONSTANTS }
|
||||||
|
@ -1,12 +1,16 @@
|
|||||||
|
use clippy_config::msrvs::{self, Msrv};
|
||||||
|
use clippy_config::Conf;
|
||||||
use clippy_utils::diagnostics::{span_lint_and_sugg, span_lint_and_then};
|
use clippy_utils::diagnostics::{span_lint_and_sugg, span_lint_and_then};
|
||||||
use clippy_utils::source::snippet_opt;
|
use clippy_utils::source::snippet_opt;
|
||||||
use clippy_utils::{higher, is_integer_literal, path_to_local, peel_blocks, peel_blocks_with_stmt, SpanlessEq};
|
use clippy_utils::{
|
||||||
|
higher, in_constant, is_integer_literal, path_to_local, peel_blocks, peel_blocks_with_stmt, SpanlessEq,
|
||||||
|
};
|
||||||
use rustc_ast::ast::LitKind;
|
use rustc_ast::ast::LitKind;
|
||||||
use rustc_data_structures::packed::Pu128;
|
use rustc_data_structures::packed::Pu128;
|
||||||
use rustc_errors::Applicability;
|
use rustc_errors::Applicability;
|
||||||
use rustc_hir::{BinOp, BinOpKind, Expr, ExprKind, HirId, QPath};
|
use rustc_hir::{BinOp, BinOpKind, Expr, ExprKind, HirId, QPath};
|
||||||
use rustc_lint::{LateContext, LateLintPass};
|
use rustc_lint::{LateContext, LateLintPass};
|
||||||
use rustc_session::declare_lint_pass;
|
use rustc_session::impl_lint_pass;
|
||||||
use rustc_span::Span;
|
use rustc_span::Span;
|
||||||
|
|
||||||
declare_clippy_lint! {
|
declare_clippy_lint! {
|
||||||
@ -71,13 +75,28 @@
|
|||||||
"Check if a variable is smaller than another one and still subtract from it even if smaller"
|
"Check if a variable is smaller than another one and still subtract from it even if smaller"
|
||||||
}
|
}
|
||||||
|
|
||||||
declare_lint_pass!(ImplicitSaturatingSub => [IMPLICIT_SATURATING_SUB, INVERTED_SATURATING_SUB]);
|
pub struct ImplicitSaturatingSub {
|
||||||
|
msrv: Msrv,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl_lint_pass!(ImplicitSaturatingSub => [IMPLICIT_SATURATING_SUB, INVERTED_SATURATING_SUB]);
|
||||||
|
|
||||||
|
impl ImplicitSaturatingSub {
|
||||||
|
pub fn new(conf: &'static Conf) -> Self {
|
||||||
|
Self {
|
||||||
|
msrv: conf.msrv.clone(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl<'tcx> LateLintPass<'tcx> for ImplicitSaturatingSub {
|
impl<'tcx> LateLintPass<'tcx> for ImplicitSaturatingSub {
|
||||||
fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) {
|
fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) {
|
||||||
if expr.span.from_expansion() {
|
if expr.span.from_expansion() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if in_constant(cx, expr.hir_id) && !self.msrv.meets(msrvs::SATURATING_SUB_CONST) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
if let Some(higher::If { cond, then, r#else: None }) = higher::If::hir(expr)
|
if let Some(higher::If { cond, then, r#else: None }) = higher::If::hir(expr)
|
||||||
|
|
||||||
// Check if the conditional expression is a binary operation
|
// Check if the conditional expression is a binary operation
|
||||||
@ -94,6 +113,8 @@ fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) {
|
|||||||
check_manual_check(cx, expr, cond_op, cond_left, cond_right, if_block, else_block);
|
check_manual_check(cx, expr, cond_op, cond_left, cond_right, if_block, else_block);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
extract_msrv_attr!(LateContext);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn check_manual_check<'tcx>(
|
fn check_manual_check<'tcx>(
|
||||||
|
@ -623,7 +623,7 @@ pub fn register_lints(store: &mut rustc_lint::LintStore, conf: &'static Conf) {
|
|||||||
store.register_late_pass(|_| Box::new(unit_return_expecting_ord::UnitReturnExpectingOrd));
|
store.register_late_pass(|_| Box::new(unit_return_expecting_ord::UnitReturnExpectingOrd));
|
||||||
store.register_late_pass(|_| Box::new(strings::StringAdd));
|
store.register_late_pass(|_| Box::new(strings::StringAdd));
|
||||||
store.register_late_pass(|_| Box::new(implicit_return::ImplicitReturn));
|
store.register_late_pass(|_| Box::new(implicit_return::ImplicitReturn));
|
||||||
store.register_late_pass(|_| Box::new(implicit_saturating_sub::ImplicitSaturatingSub));
|
store.register_late_pass(move |_| Box::new(implicit_saturating_sub::ImplicitSaturatingSub::new(conf)));
|
||||||
store.register_late_pass(|_| Box::new(default_numeric_fallback::DefaultNumericFallback));
|
store.register_late_pass(|_| Box::new(default_numeric_fallback::DefaultNumericFallback));
|
||||||
store.register_late_pass(|_| Box::new(inconsistent_struct_constructor::InconsistentStructConstructor));
|
store.register_late_pass(|_| Box::new(inconsistent_struct_constructor::InconsistentStructConstructor));
|
||||||
store.register_late_pass(|_| Box::new(non_octal_unix_permissions::NonOctalUnixPermissions));
|
store.register_late_pass(|_| Box::new(non_octal_unix_permissions::NonOctalUnixPermissions));
|
||||||
|
Loading…
Reference in New Issue
Block a user