diff options
| author | bors <bors@rust-lang.org> | 2020-03-04 00:06:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-04 00:06:25 +0000 |
| commit | 74eae9dc602bf8f1c54525bf3113e4b6508f0ade (patch) | |
| tree | e54c5d714b8db42b71938f7f8c5d0c6005449f97 | |
| parent | 9c93f04c90ba36bca069aebe1bf508d29aa52b94 (diff) | |
| parent | a640696cdf7f14b599ea1bca1c9cbbe1cf1b1fdf (diff) | |
| download | rust-74eae9dc602bf8f1c54525bf3113e4b6508f0ade.tar.gz rust-74eae9dc602bf8f1c54525bf3113e4b6508f0ade.zip | |
Auto merge of #5264 - flip1995:rustup, r=flip1995
Rustup to rust-lang/rust#69506 changelog: none
| -rw-r--r-- | tests/ui/author/blocks.rs | 2 | ||||
| -rw-r--r-- | tests/ui/author/blocks.stdout | 5 | ||||
| -rw-r--r-- | tests/ui/swap.fixed | 2 | ||||
| -rw-r--r-- | tests/ui/swap.rs | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/tests/ui/author/blocks.rs b/tests/ui/author/blocks.rs index 6034762d130..a8068436b70 100644 --- a/tests/ui/author/blocks.rs +++ b/tests/ui/author/blocks.rs @@ -1,5 +1,5 @@ #![feature(stmt_expr_attributes)] -#![allow(redundant_semicolon, clippy::no_effect)] +#![allow(redundant_semicolons, clippy::no_effect)] #[rustfmt::skip] fn main() { diff --git a/tests/ui/author/blocks.stdout b/tests/ui/author/blocks.stdout index c7127db904a..c8ef75e48fc 100644 --- a/tests/ui/author/blocks.stdout +++ b/tests/ui/author/blocks.stdout @@ -1,10 +1,7 @@ if_chain! { if let ExprKind::Block(ref block) = expr.kind; if let Some(trailing_expr) = &block.expr; - if block.stmts.len() == 1; - if let StmtKind::Semi(ref e, _) = block.stmts[0].kind - if let ExprKind::Tup(ref elements) = e.kind; - if elements.len() == 0; + if block.stmts.len() == 0; then { // report your lint here } diff --git a/tests/ui/swap.fixed b/tests/ui/swap.fixed index 82931bf91fd..0f8f839a0d5 100644 --- a/tests/ui/swap.fixed +++ b/tests/ui/swap.fixed @@ -5,7 +5,7 @@ clippy::blacklisted_name, clippy::no_effect, clippy::redundant_clone, - redundant_semicolon, + redundant_semicolons, unused_assignments )] diff --git a/tests/ui/swap.rs b/tests/ui/swap.rs index 4582db4b40e..5763d9e82d4 100644 --- a/tests/ui/swap.rs +++ b/tests/ui/swap.rs @@ -5,7 +5,7 @@ clippy::blacklisted_name, clippy::no_effect, clippy::redundant_clone, - redundant_semicolon, + redundant_semicolons, unused_assignments )] |