extract type comparison

Author: tnielens

clippy_lints/src/use_self.rs

@@ -167,15 +167,15 @@ impl<'a, 'tcx> Visitor<'tcx> for ImplVisitor<'a, 'tcx> {
     }
 
     fn visit_expr(&mut self, expr: &'tcx Expr<'tcx>) {
+        fn expr_ty_matches<'a, 'tcx>(expr: &'tcx Expr<'tcx>, self_ty: Ty<'tcx>, cx: &LateContext<'a, 'tcx>) -> bool {
+            cx.tcx
+                .typeck_tables_of(expr.hir_id.owner.to_def_id())
+                .node_type(expr.hir_id)
+                == self_ty
+        }
         match expr.kind {
             ExprKind::Struct(QPath::Resolved(_, path), ..) => {
-                if self
-                    .cx
-                    .tcx
-                    .typeck_tables_of(expr.hir_id.owner.to_def_id())
-                    .node_type(expr.hir_id)
-                    == self.self_ty
-                {
+                if expr_ty_matches(expr, self.self_ty, self.cx) {
                     match path.res {
                         def::Res::SelfTy(..) => (),
                         def::Res::Def(DefKind::Variant, _) => span_lint_ignore_last_segment(self.cx, path),
@@ -201,13 +201,7 @@ impl<'a, 'tcx> Visitor<'tcx> for ImplVisitor<'a, 'tcx> {
                 },
                 _,
             ) => {
-                if self
-                    .cx
-                    .tcx
-                    .typeck_tables_of(expr.hir_id.owner.to_def_id())
-                    .node_type(expr.hir_id)
-                    == self.self_ty
-                {
+                if expr_ty_matches(expr, self.self_ty, self.cx) {
                     match ctor_of {
                         def::CtorOf::Struct => span_lint(self.cx, path.span),
                         def::CtorOf::Variant => span_lint_ignore_last_segment(self.cx, path),