From a640696cdf7f14b599ea1bca1c9cbbe1cf1b1fdf Mon Sep 17 00:00:00 2001
From: flip1995 <hello@philkrones.com>
Date: Wed, 4 Mar 2020 00:54:27 +0100
Subject: [PATCH] Rustup to rust-lang/rust#69506

---
 tests/ui/author/blocks.rs     | 2 +-
 tests/ui/author/blocks.stdout | 5 +----
 tests/ui/swap.fixed           | 2 +-
 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 6034762d130ae..a8068436b70bf 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 c7127db904a38..c8ef75e48fc22 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 82931bf91fdf2..0f8f839a0d542 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 4582db4b40e29..5763d9e82d486 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
 )]