diff options
| author | bors <bors@rust-lang.org> | 2020-02-24 05:58:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-02-24 05:58:17 +0000 |
| commit | fc5d0cc583cb1cd35d58fdb7f3e0cfa12dccd6c0 (patch) | |
| tree | 1e10f2786c4207ba327c19e5ace4459bd87c76f7 | |
| parent | 7e49122f20a63e4aadb28e80a2e67cce0737f8a9 (diff) | |
| parent | 036ec5b63d4c507c6021c572a9102145b429fde5 (diff) | |
| download | rust-fc5d0cc583cb1cd35d58fdb7f3e0cfa12dccd6c0.tar.gz rust-fc5d0cc583cb1cd35d58fdb7f3e0cfa12dccd6c0.zip | |
Auto merge of #5221 - JohnTitor:rustup, r=phansch
Rustup to rust-lang/rust#69366 changelog: none
| -rw-r--r-- | clippy_lints/src/excessive_bools.rs | 4 | ||||
| -rw-r--r-- | clippy_lints/src/non_expressive_names.rs | 4 | ||||
| -rw-r--r-- | clippy_lints/src/redundant_static_lifetimes.rs | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/clippy_lints/src/excessive_bools.rs b/clippy_lints/src/excessive_bools.rs index aa91ab3bc77..71537d4a9f0 100644 --- a/clippy_lints/src/excessive_bools.rs +++ b/clippy_lints/src/excessive_bools.rs @@ -162,12 +162,12 @@ 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); } } }, - ItemKind::Fn(fn_sig, _, _) => self.check_fn_sig(cx, fn_sig, item.span), + ItemKind::Fn(_, fn_sig, _, _) => self.check_fn_sig(cx, fn_sig, item.span), _ => (), } } diff --git a/clippy_lints/src/non_expressive_names.rs b/clippy_lints/src/non_expressive_names.rs index de5ae5d3032..cb3e9ccba1e 100644 --- a/clippy_lints/src/non_expressive_names.rs +++ b/clippy_lints/src/non_expressive_names.rs @@ -354,13 +354,13 @@ impl<'a, 'tcx> Visitor<'tcx> for SimilarNamesLocalVisitor<'a, 'tcx> { impl EarlyLintPass for NonExpressiveNames { fn check_item(&mut self, cx: &EarlyContext<'_>, item: &Item) { - if let ItemKind::Fn(ref sig, _, Some(ref blk)) = item.kind { + if let ItemKind::Fn(_, ref sig, _, Some(ref blk)) = item.kind { do_check(self, cx, &item.attrs, &sig.decl, blk); } } 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); } } diff --git a/clippy_lints/src/redundant_static_lifetimes.rs b/clippy_lints/src/redundant_static_lifetimes.rs index 98ec793de7c..feb045f9c15 100644 --- a/clippy_lints/src/redundant_static_lifetimes.rs +++ b/clippy_lints/src/redundant_static_lifetimes.rs @@ -79,7 +79,7 @@ impl RedundantStaticLifetimes { impl EarlyLintPass for RedundantStaticLifetimes { fn check_item(&mut self, cx: &EarlyContext<'_>, item: &Item) { if !item.span.from_expansion() { - if let ItemKind::Const(ref var_type, _) = item.kind { + if let ItemKind::Const(_, ref var_type, _) = item.kind { self.visit_type(var_type, cx, "Constants have by default a `'static` lifetime"); // Don't check associated consts because `'static` cannot be elided on those (issue // #2438) |