mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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
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 { 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 { if let ty::Param(_) = subst.kind {
return; return;
} }

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

@ -36,7 +36,7 @@
use rustc::ty::{ use rustc::ty::{
self, self,
layout::{self, IntegerExt}, layout::{self, IntegerExt},
subst::Kind, subst::GenericArg,
Binder, Ty, TyCtxt, Binder, Ty, TyCtxt,
}; };
use rustc_errors::Applicability; use rustc_errors::Applicability;
@ -307,7 +307,7 @@ pub fn implements_trait<'a, 'tcx>(
cx: &LateContext<'a, 'tcx>, cx: &LateContext<'a, 'tcx>,
ty: Ty<'tcx>, ty: Ty<'tcx>,
trait_id: DefId, trait_id: DefId,
ty_params: &[Kind<'tcx>], ty_params: &[GenericArg<'tcx>],
) -> bool { ) -> bool {
let ty = cx.tcx.erase_regions(&ty); let ty = cx.tcx.erase_regions(&ty);
let obligation = cx.tcx.predicate_for_trait_def( let obligation = cx.tcx.predicate_for_trait_def(