From e59d619981d3f55a6a268b54b1b61c5579055140 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= <matthias.krueger@famsik.de>
Date: Thu, 26 Sep 2019 18:34:43 +0200
Subject: [PATCH] rustup https://github.com/rust-lang/rust/pull/64515

changelog: none
---
 clippy_lints/src/derive.rs    | 2 +-
 clippy_lints/src/utils/mod.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/clippy_lints/src/derive.rs b/clippy_lints/src/derive.rs
index 6be04dfa6..ab9568931 100644
--- a/clippy_lints/src/derive.rs
+++ b/clippy_lints/src/derive.rs
@@ -146,7 +146,7 @@ fn check_copy_clone<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, item: &Item, trait_ref
                         }
                     }
                     for subst in substs {
-                        if let ty::subst::UnpackedKind::Type(subst) = subst.unpack() {
+                        if let ty::subst::GenericArgKind::Type(subst) = subst.unpack() {
                             if let ty::Param(_) = subst.kind {
                                 return;
                             }
diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs
index 235c083db..f98ff14b8 100644
--- a/clippy_lints/src/utils/mod.rs
+++ b/clippy_lints/src/utils/mod.rs
@@ -36,7 +36,7 @@ use rustc::traits;
 use rustc::ty::{
     self,
     layout::{self, IntegerExt},
-    subst::Kind,
+    subst::GenericArg,
     Binder, Ty, TyCtxt,
 };
 use rustc_errors::Applicability;
@@ -307,7 +307,7 @@ pub fn implements_trait<'a, 'tcx>(
     cx: &LateContext<'a, 'tcx>,
     ty: Ty<'tcx>,
     trait_id: DefId,
-    ty_params: &[Kind<'tcx>],
+    ty_params: &[GenericArg<'tcx>],
 ) -> bool {
     let ty = cx.tcx.erase_regions(&ty);
     let obligation = cx.tcx.predicate_for_trait_def(