-use crate::utils::{higher, in_macro, match_qpath, span_lint_and_sugg, SpanlessEq};
+use clippy_utils::diagnostics::span_lint_and_sugg;
+use clippy_utils::{in_macro, match_qpath, SpanlessEq};
use if_chain::if_chain;
use rustc_ast::ast::LitKind;
use rustc_errors::Applicability;
return;
}
if_chain! {
- if let Some((ref cond, ref then, None)) = higher::if_block(&expr);
+ if let ExprKind::If(cond, then, None) = &expr.kind;
// Check if the conditional expression is a binary operation
if let ExprKind::Binary(ref cond_op, ref cond_left, ref cond_right) = cond.kind;
if let Some(target) = subtracts_one(cx, e);
// Extracting out the variable name
- if let ExprKind::Path(ref assign_path) = target.kind;
- if let QPath::Resolved(_, ref ares_path) = assign_path;
+ if let ExprKind::Path(QPath::Resolved(_, ref ares_path)) = target.kind;
then {
// Handle symmetric conditions in the if statement
cx,
IMPLICIT_SATURATING_SUB,
expr.span,
- "Implicitly performing saturating subtraction",
+ "implicitly performing saturating subtraction",
"try",
- format!("{} = {}.saturating_sub({});", var_name, var_name, 1.to_string()),
+ format!("{} = {}.saturating_sub({});", var_name, var_name, '1'),
Applicability::MachineApplicable,
);
}