Rustup to rustc 1.26.0-nightly (322d7f7b9 2018-02-25)

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

diff --git a/clippy_lints/src/derive.rs b/clippy_lints/src/derive.rs
index 2c45aaf6ac935402639fcf929432ca77560dcb64..8702ec1e716a8679d9bfa6f28904dcde08675c9c 100644 (file)
--- a/clippy_lints/src/derive.rs
+++ b/clippy_lints/src/derive.rs
@@ -98,13 +98,13 @@ fn check_hash_peq<'a, 'tcx>(
             // Look for the PartialEq implementations for `ty`
             cx.tcx.for_each_relevant_impl(peq_trait_def_id, ty, |impl_id| {
                 let peq_is_automatically_derived = is_automatically_derived(&cx.tcx.get_attrs(impl_id));
-    
+
                 if peq_is_automatically_derived == hash_is_automatically_derived {
                     return;
                 }
-    
+
                 let trait_ref = cx.tcx.impl_trait_ref(impl_id).expect("must be a trait implementation");
-    
+
                 // Only care about `impl PartialEq<Foo> for Foo`
                 // For `impl PartialEq<B> for A, input_types is [A, B]
                 if trait_ref.substs.type_at(1) == ty {
@@ -113,7 +113,7 @@ fn check_hash_peq<'a, 'tcx>(
                     } else {
                         "you are deriving `Hash` but have implemented `PartialEq` explicitly"
                     };
-    
+
                     span_lint_and_then(
                         cx, DERIVE_HASH_XOR_EQ, span,
                         mess,
@@ -148,6 +148,13 @@ fn check_copy_clone<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, item: &Item, trait_ref
                         return;
                     }
                 }
+                for subst in substs {
+                    if let ty::subst::UnpackedKind::Type(subst) = subst.unpack() {
+                        if let ty::TyParam(_) = subst.sty {
+                            return;
+                        }
+                    }
+                }
             },
             _ => (),
         }
@@ -157,7 +164,9 @@ fn check_copy_clone<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, item: &Item, trait_ref
             EXPL_IMPL_CLONE_ON_COPY,
             item.span,
             "you are implementing `Clone` explicitly on a `Copy` type",
-            |db| { db.span_note(item.span, "consider deriving `Clone` or removing `Copy`"); },
+            |db| {
+                db.span_note(item.span, "consider deriving `Clone` or removing `Copy`");
+            },
         );
     }
 }