Auto merge of - krishna-veerareddy:rustup-69004, r=flip1995

Rustup to 

changelog: none
This commit is contained in:
bors 2020-02-09 22:59:08 +00:00
commit 701a5791ac
2 changed files with 3 additions and 1 deletions
clippy_lints/src

@ -279,7 +279,7 @@ fn has_is_empty(cx: &LateContext<'_, '_>, expr: &Expr<'_>) -> bool {
cx.tcx
.inherent_impls(id)
.iter()
.any(|imp| cx.tcx.associated_items(*imp).any(|item| is_is_empty(cx, &item)))
.any(|imp| cx.tcx.associated_items(*imp).iter().any(|item| is_is_empty(cx, &item)))
}
let ty = &walk_ptrs_ty(cx.tables.expr_ty(expr));
@ -288,6 +288,7 @@ fn has_is_empty(cx: &LateContext<'_, '_>, expr: &Expr<'_>) -> bool {
if let Some(principal) = tt.principal() {
cx.tcx
.associated_items(principal.def_id())
.iter()
.any(|item| is_is_empty(cx, &item))
} else {
false

@ -125,6 +125,7 @@ fn check_trait_method_impl_decl<'a, 'tcx>(
let trait_method = cx
.tcx
.associated_items(impl_trait_ref.def_id)
.iter()
.find(|assoc_item| {
assoc_item.kind == ty::AssocKind::Method
&& cx