-use crate::utils::is_adjusted;
-use crate::utils::span_lint;
-use rustc::hir::def::{DefKind, Res};
-use rustc::hir::{Expr, ExprKind};
-use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
-use rustc::{declare_lint_pass, declare_tool_lint};
+use crate::utils::{is_adjusted, span_lint};
+use rustc_hir::def::{DefKind, Res};
+use rustc_hir::{Expr, ExprKind};
+use rustc_lint::{LateContext, LateLintPass};
+use rustc_session::{declare_lint_pass, declare_tool_lint};
declare_clippy_lint! {
/// **What it does:** Checks for construction of a structure or tuple just to
"assignments to temporaries"
}
-fn is_temporary(cx: &LateContext<'_, '_>, expr: &Expr) -> bool {
- match &expr.node {
+fn is_temporary(cx: &LateContext<'_>, expr: &Expr<'_>) -> bool {
+ match &expr.kind {
ExprKind::Struct(..) | ExprKind::Tup(..) => true,
- ExprKind::Path(qpath) => {
- if let Res::Def(DefKind::Const, ..) = cx.tables.qpath_res(qpath, expr.hir_id) {
- true
- } else {
- false
- }
- },
+ ExprKind::Path(qpath) => matches!(cx.qpath_res(qpath, expr.hir_id), Res::Def(DefKind::Const, ..)),
_ => false,
}
}
declare_lint_pass!(TemporaryAssignment => [TEMPORARY_ASSIGNMENT]);
-impl<'a, 'tcx> LateLintPass<'a, 'tcx> for TemporaryAssignment {
- fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
- if let ExprKind::Assign(target, _) = &expr.node {
+impl<'tcx> LateLintPass<'tcx> for TemporaryAssignment {
+ fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
+ if let ExprKind::Assign(target, ..) = &expr.kind {
let mut base = target;
- while let ExprKind::Field(f, _) | ExprKind::Index(f, _) = &base.node {
+ while let ExprKind::Field(f, _) | ExprKind::Index(f, _) = &base.kind {
base = f;
}
if is_temporary(cx, base) && !is_adjusted(cx, base) {