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

Rustup to rust-lang/rust#69506

changelog: none
This commit is contained in:
bors 2020-03-04 00:06:25 +00:00
commit 74eae9dc60
4 changed files with 4 additions and 7 deletions

View File

@ -1,5 +1,5 @@
#![feature(stmt_expr_attributes)] #![feature(stmt_expr_attributes)]
#![allow(redundant_semicolon, clippy::no_effect)] #![allow(redundant_semicolons, clippy::no_effect)]
#[rustfmt::skip] #[rustfmt::skip]
fn main() { fn main() {

View File

@ -1,10 +1,7 @@
if_chain! { if_chain! {
if let ExprKind::Block(ref block) = expr.kind; if let ExprKind::Block(ref block) = expr.kind;
if let Some(trailing_expr) = &block.expr; if let Some(trailing_expr) = &block.expr;
if block.stmts.len() == 1; if block.stmts.len() == 0;
if let StmtKind::Semi(ref e, _) = block.stmts[0].kind
if let ExprKind::Tup(ref elements) = e.kind;
if elements.len() == 0;
then { then {
// report your lint here // report your lint here
} }

View File

@ -5,7 +5,7 @@
clippy::blacklisted_name, clippy::blacklisted_name,
clippy::no_effect, clippy::no_effect,
clippy::redundant_clone, clippy::redundant_clone,
redundant_semicolon, redundant_semicolons,
unused_assignments unused_assignments
)] )]

View File

@ -5,7 +5,7 @@
clippy::blacklisted_name, clippy::blacklisted_name,
clippy::no_effect, clippy::no_effect,
clippy::redundant_clone, clippy::redundant_clone,
redundant_semicolon, redundant_semicolons,
unused_assignments unused_assignments
)] )]