Auto merge of #5264 - flip1995:rustup, r=flip1995

Rustup to #69506 changelog: none
rust-lang · Mar 4, 2020 · 74eae9d · 74eae9d
2 parents 9c93f04 + a640696
commit 74eae9d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -5,7 +5,7 @@
     clippy::blacklisted_name,
     clippy::no_effect,
     clippy::redundant_clone,
-    redundant_semicolon,
+    redundant_semicolons,
     unused_assignments
 )]