default_trait_access skips <F as Default>::default()

[rust.git] / clippy_lints / src / default_trait_access.rs

diff --git a/clippy_lints/src/default_trait_access.rs b/clippy_lints/src/default_trait_access.rs
index 900dabc96505b44232ca56faddad0285e00e411c..d3598a5bdaae729416ac606e5019331b3bbaaad0 100644 (file)
--- a/clippy_lints/src/default_trait_access.rs
+++ b/clippy_lints/src/default_trait_access.rs
@@ -1,6 +1,8 @@
 use rustc::hir::*;
 use rustc::lint::*;
-use rustc::ty::TypeVariants;
+use rustc::{declare_lint, lint_array};
+use if_chain::if_chain;
+use rustc::ty::TyKind;
 
 use crate::utils::{any_parent_is_automatically_derived, match_def_path, opt_def_id, paths, span_lint_and_sugg};
 
@@ -46,10 +48,17 @@ fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
             then {
                 match qpath {
                     QPath::Resolved(..) => {
+                        if let ExprKind::Call(ref method, ref _args) = expr.node {
+                            if format!("{:?}", method).contains(" as Default>") {
+                                return
+                            }
+                        }
+
+
                         // TODO: Work out a way to put "whatever the imported way of referencing
                         // this type in this file" rather than a fully-qualified type.
                         let expr_ty = cx.tables.expr_ty(expr);
-                        if let TypeVariants::TyAdt(..) = expr_ty.sty {
+                        if let TyKind::Adt(..) = expr_ty.sty {
                             let replacement = format!("{}::default()", expr_ty);
                             span_lint_and_sugg(
                                 cx,