Auto merge of #68034 - Centril:rollup-3d9pq14, r=Centril

[rust.git] / src / librustc_lint / redundant_semicolon.rs

diff --git a/src/librustc_lint/redundant_semicolon.rs b/src/librustc_lint/redundant_semicolon.rs
index 7c9df3578b59cd22a168821e94261d6eb8003bb1..8dbf96a155825dd78956825dbe5b1306c944aa1b 100644 (file)
--- a/src/librustc_lint/redundant_semicolon.rs
+++ b/src/librustc_lint/redundant_semicolon.rs
@@ -1,5 +1,5 @@
-use crate::lint::{EarlyLintPass, LintPass, EarlyContext, LintArray, LintContext};
-use syntax::ast::{Stmt, StmtKind, ExprKind};
+use crate::lint::{EarlyContext, EarlyLintPass, LintArray, LintContext, LintPass};
+use syntax::ast::{ExprKind, Stmt, StmtKind};
 use syntax::errors::Applicability;
 
 declare_lint! {
@@ -12,8 +12,8 @@
 
 impl EarlyLintPass for RedundantSemicolon {
     fn check_stmt(&mut self, cx: &EarlyContext<'_>, stmt: &Stmt) {
-        if let StmtKind::Semi(expr) = &stmt.node {
-            if let ExprKind::Tup(ref v) = &expr.node {
+        if let StmtKind::Semi(expr) = &stmt.kind {
+            if let ExprKind::Tup(ref v) = &expr.kind {
                 if v.is_empty() {
                     // Strings of excess semicolons are encoded as empty tuple expressions
                     // during the parsing stage, so we check for empty tuple expressions
@@ -26,11 +26,7 @@ fn check_stmt(&mut self, cx: &EarlyContext<'_>, stmt: &Stmt) {
                             } else {
                                 "unnecessary trailing semicolon"
                             };
-                            let mut err = cx.struct_span_lint(
-                                REDUNDANT_SEMICOLON,
-                                stmt.span,
-                                &msg
-                            );
+                            let mut err = cx.struct_span_lint(REDUNDANT_SEMICOLON, stmt.span, &msg);
                             let suggest_msg = if multiple {
                                 "remove these semicolons"
                             } else {
@@ -40,7 +36,7 @@ fn check_stmt(&mut self, cx: &EarlyContext<'_>, stmt: &Stmt) {
                                 stmt.span,
                                 &suggest_msg,
                                 String::new(),
-                                Applicability::MaybeIncorrect
+                                Applicability::MaybeIncorrect,
                             );
                             err.emit();
                         }