squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Auto merge of #4582 - matthiaskrgr:rustup_17, r=Manishearth

Browse source 
rustup https://github.com/rust-lang/rust/pull/64515

changelog: none
This commit is contained in:
bors 2019-09-26 17:32:24 +00:00
parent b5600c9852 e59d619981
commit 68ff8b19bc
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clippy_lints/src/derive.rs
View file

@ -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;
}

4
clippy_lints/src/utils/mod.rs
View file

@ -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(