Rollup merge of #67948 - llogiq:gallop, r=Mark-Simulacrum

[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 0adf1eeb410b02caa36ef22a71a7192676fd7b6f..dc18f15fe40cb95072f52326133bad2b2b4721e5 100644 (file)
--- a/src/librustc_lint/redundant_semicolon.rs
+++ b/src/librustc_lint/redundant_semicolon.rs
@@ -1,6 +1,6 @@
-use crate::lint::{EarlyLintPass, LintPass, EarlyContext, LintArray, LintContext};
-use syntax::ast::{Stmt, StmtKind, ExprKind};
-use syntax::errors::Applicability;
+use rustc::lint::{EarlyContext, EarlyLintPass, LintContext};
+use rustc_errors::Applicability;
+use syntax::ast::{ExprKind, Stmt, StmtKind};
 
 declare_lint! {
     pub REDUNDANT_SEMICOLON,
@@ -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();
                         }