Auto merge of #5195 - JohnTitor:rustup-take2, r=matthiaskrgr

Rustup to rust-lang/rust#69194

changelog: none
This commit is contained in:
bors 2020-02-19 01:50:53 +00:00
commit 2855b21439
2 changed files with 2 additions and 2 deletions

View File

@ -162,7 +162,7 @@ impl EarlyLintPass for ExcessiveBools {
}
| ItemKind::Trait(_, _, _, _, items) => {
for item in items {
if let AssocItemKind::Fn(fn_sig, _) = &item.kind {
if let AssocItemKind::Fn(fn_sig, _, _) = &item.kind {
self.check_fn_sig(cx, fn_sig, item.span);
}
}

View File

@ -358,7 +358,7 @@ impl EarlyLintPass for NonExpressiveNames {
}
fn check_impl_item(&mut self, cx: &EarlyContext<'_>, item: &AssocItem) {
if let AssocItemKind::Fn(ref sig, Some(ref blk)) = item.kind {
if let AssocItemKind::Fn(ref sig, _, Some(ref blk)) = item.kind {
do_check(self, cx, &item.attrs, &sig.decl, blk);
}
}