Skip to content

Commit 74eae9d

Browse files
committed
Auto merge of #5264 - flip1995:rustup, r=flip1995
Rustup to #69506 changelog: none
2 parents 9c93f04 + a640696 commit 74eae9d

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

tests/ui/author/blocks.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#![feature(stmt_expr_attributes)]
2-
#![allow(redundant_semicolon, clippy::no_effect)]
2+
#![allow(redundant_semicolons, clippy::no_effect)]
33

44
#[rustfmt::skip]
55
fn main() {

tests/ui/author/blocks.stdout

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
if_chain! {
22
if let ExprKind::Block(ref block) = expr.kind;
33
if let Some(trailing_expr) = &block.expr;
4-
if block.stmts.len() == 1;
5-
if let StmtKind::Semi(ref e, _) = block.stmts[0].kind
6-
if let ExprKind::Tup(ref elements) = e.kind;
7-
if elements.len() == 0;
4+
if block.stmts.len() == 0;
85
then {
96
// report your lint here
107
}

tests/ui/swap.fixed

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
clippy::blacklisted_name,
66
clippy::no_effect,
77
clippy::redundant_clone,
8-
redundant_semicolon,
8+
redundant_semicolons,
99
unused_assignments
1010
)]
1111

tests/ui/swap.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
clippy::blacklisted_name,
66
clippy::no_effect,
77
clippy::redundant_clone,
8-
redundant_semicolon,
8+
redundant_semicolons,
99
unused_assignments
1010
)]
1111

0 commit comments

Comments
 (0)