Skip to content

Commit

Permalink
Auto merge of #5195 - JohnTitor:rustup-take2, r=matthiaskrgr
Browse files Browse the repository at this point in the history
Rustup to #69194

changelog: none
  • Loading branch information
bors committed Feb 19, 2020
2 parents fe0f6c6 + 79c0cf0 commit 2855b21
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion clippy_lints/src/excessive_bools.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
2 changes: 1 addition & 1 deletion clippy_lints/src/non_expressive_names.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down

0 comments on commit 2855b21

Please sign in to comment.