-use if_chain::if_chain;
-use rustc::hir;
-use rustc::hir::intravisit::{walk_expr, NestedVisitorMap, Visitor};
-use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
-use rustc::{declare_lint_pass, declare_tool_lint};
-use rustc_errors::Applicability;
-
use crate::utils::{
get_trait_def_id, implements_trait, snippet_opt, span_lint_and_then, trait_ref_of_method, SpanlessEq,
};
use crate::utils::{higher, sugg};
+use if_chain::if_chain;
+use rustc::hir::map::Map;
+use rustc_errors::Applicability;
+use rustc_hir as hir;
+use rustc_hir::intravisit::{walk_expr, NestedVisitorMap, Visitor};
+use rustc_lint::{LateContext, LateLintPass};
+use rustc_session::{declare_lint_pass, declare_tool_lint};
declare_clippy_lint! {
/// **What it does:** Checks for `a = a op b` or `a = b commutative_op a`
/// **Example:**
/// ```rust
/// let mut a = 5;
- /// ...
+ /// let b = 2;
+ /// // ...
/// a += a + b;
/// ```
pub MISREFACTORED_ASSIGN_OP,
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for AssignOps {
#[allow(clippy::too_many_lines)]
- fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx hir::Expr) {
- match &expr.node {
+ fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx hir::Expr<'_>) {
+ match &expr.kind {
hir::ExprKind::AssignOp(op, lhs, rhs) => {
- if let hir::ExprKind::Binary(binop, l, r) = &rhs.node {
+ if let hir::ExprKind::Binary(binop, l, r) = &rhs.kind {
if op.node != binop.node {
return;
}
}
}
},
- hir::ExprKind::Assign(assignee, e) => {
- if let hir::ExprKind::Binary(op, l, r) = &e.node {
+ hir::ExprKind::Assign(assignee, e, _) => {
+ if let hir::ExprKind::Binary(op, l, r) = &e.kind {
#[allow(clippy::cognitive_complexity)]
- let lint = |assignee: &hir::Expr, rhs: &hir::Expr| {
+ let lint = |assignee: &hir::Expr<'_>, rhs: &hir::Expr<'_>| {
let ty = cx.tables.expr_ty(assignee);
let rty = cx.tables.expr_ty(rhs);
macro_rules! ops {
match $op {
$(hir::BinOpKind::$trait_name => {
let [krate, module] = crate::utils::paths::OPS_MODULE;
- let path = [krate, module, concat!(stringify!($trait_name), "Assign")];
+ let path: [&str; 3] = [krate, module, concat!(stringify!($trait_name), "Assign")];
let trait_id = if let Some(trait_id) = get_trait_def_id($cx, &path) {
trait_id
} else {
let parent_fn = cx.tcx.hir().get_parent_item(e.hir_id);
if_chain! {
if let Some(trait_ref) = trait_ref_of_method(cx, parent_fn);
- if trait_ref.path.def.def_id() == trait_id;
+ if trait_ref.path.res.def_id() == trait_id;
then { return; }
}
implements_trait($cx, $ty, trait_id, &[$rty])
fn lint_misrefactored_assign_op(
cx: &LateContext<'_, '_>,
- expr: &hir::Expr,
+ expr: &hir::Expr<'_>,
op: hir::BinOp,
- rhs: &hir::Expr,
- assignee: &hir::Expr,
- rhs_other: &hir::Expr,
+ rhs: &hir::Expr<'_>,
+ assignee: &hir::Expr<'_>,
+ rhs_other: &hir::Expr<'_>,
) {
span_lint_and_then(
cx,
db.span_suggestion(
expr.span,
&format!(
- "Did you mean {} = {} {} {} or {}? Consider replacing it with",
+ "Did you mean `{} = {} {} {}` or `{}`? Consider replacing it with",
snip_a,
snip_a,
op.node.as_str(),
long
),
format!("{} {}= {}", snip_a, op.node.as_str(), snip_r),
- Applicability::MachineApplicable,
+ Applicability::MaybeIncorrect,
);
db.span_suggestion(
expr.span,
"or",
long,
- Applicability::MachineApplicable, // snippet
+ Applicability::MaybeIncorrect, // snippet
);
}
},
);
}
+#[must_use]
fn is_commutative(op: hir::BinOpKind) -> bool {
- use rustc::hir::BinOpKind::*;
+ use rustc_hir::BinOpKind::{
+ Add, And, BitAnd, BitOr, BitXor, Div, Eq, Ge, Gt, Le, Lt, Mul, Ne, Or, Rem, Shl, Shr, Sub,
+ };
match op {
Add | Mul | And | Or | BitXor | BitAnd | BitOr | Eq | Ne => true,
Sub | Div | Rem | Shl | Shr | Lt | Le | Ge | Gt => false,
}
}
-struct ExprVisitor<'a, 'tcx: 'a> {
- assignee: &'a hir::Expr,
+struct ExprVisitor<'a, 'tcx> {
+ assignee: &'a hir::Expr<'a>,
counter: u8,
cx: &'a LateContext<'a, 'tcx>,
}
-impl<'a, 'tcx: 'a> Visitor<'tcx> for ExprVisitor<'a, 'tcx> {
- fn visit_expr(&mut self, expr: &'tcx hir::Expr) {
+impl<'a, 'tcx> Visitor<'tcx> for ExprVisitor<'a, 'tcx> {
+ type Map = Map<'tcx>;
+
+ fn visit_expr(&mut self, expr: &'tcx hir::Expr<'_>) {
if SpanlessEq::new(self.cx).ignore_fn().eq_expr(self.assignee, expr) {
self.counter += 1;
}
walk_expr(self, expr);
}
- fn nested_visit_map<'this>(&'this mut self) -> NestedVisitorMap<'this, 'tcx> {
+ fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
NestedVisitorMap::None
}
}