about summary refs log tree commit diff
diff options
context:
space:
mode:
authorflip1995 <hello@philkrones.com>2020-03-04 00:54:27 +0100
committerflip1995 <hello@philkrones.com>2020-03-04 00:56:43 +0100
commita640696cdf7f14b599ea1bca1c9cbbe1cf1b1fdf (patch)
treee54c5d714b8db42b71938f7f8c5d0c6005449f97
parent9c93f04c90ba36bca069aebe1bf508d29aa52b94 (diff)
downloadrust-a640696cdf7f14b599ea1bca1c9cbbe1cf1b1fdf.tar.gz
rust-a640696cdf7f14b599ea1bca1c9cbbe1cf1b1fdf.zip
Rustup to rust-lang/rust#69506
-rw-r--r--tests/ui/author/blocks.rs2
-rw-r--r--tests/ui/author/blocks.stdout5
-rw-r--r--tests/ui/swap.fixed2
-rw-r--r--tests/ui/swap.rs2
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
 )]