turn into early-pass lint

- replace the check for trailing expr / last stmt with a check on last
`block.stmts.last()`

this by itself fixes the issue

Author: ada4a

clippy_lints/src/lib.rs

@@ -733,7 +733,7 @@ pub fn register_lint_passes(store: &mut rustc_lint::LintStore, conf: &'static Co
     store.register_late_pass(|_| Box::new(from_raw_with_void_ptr::FromRawWithVoidPtr));
     store.register_late_pass(|_| Box::new(suspicious_xor_used_as_pow::ConfusingXorAndPow));
     store.register_late_pass(move |_| Box::new(manual_is_ascii_check::ManualIsAsciiCheck::new(conf)));
-    store.register_late_pass(move |_| Box::new(semicolon_block::SemicolonBlock::new(conf)));
+    store.register_early_pass(move || Box::new(semicolon_block::SemicolonBlock::new(conf)));
     store.register_late_pass(|_| Box::new(permissions_set_readonly_false::PermissionsSetReadonlyFalse));
     store.register_late_pass(|_| Box::new(size_of_ref::SizeOfRef));
     store.register_late_pass(|_| Box::new(multiple_unsafe_ops_per_block::MultipleUnsafeOpsPerBlock));

clippy_lints/src/semicolon_block.rs

@@ -1,8 +1,8 @@
 use clippy_config::Conf;
 use clippy_utils::diagnostics::span_lint_and_then;
+use rustc_ast::{Block, Expr, ExprKind, Stmt, StmtKind};
 use rustc_errors::Applicability;
-use rustc_hir::{Block, Expr, ExprKind, Stmt, StmtKind};
-use rustc_lint::{LateContext, LateLintPass, LintContext};
+use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
 use rustc_session::impl_lint_pass;
 use rustc_span::Span;
 
@@ -78,7 +78,7 @@ impl SemicolonBlock {
         }
     }
 
-    fn semicolon_inside_block(&self, cx: &impl LintContext, block: &Block<'_>, tail: &Expr<'_>, semi_span: Span) {
+    fn semicolon_inside_block(&self, cx: &impl LintContext, block: &Block, tail: &Expr, semi_span: Span) {
         let insert_span = tail.span.source_callsite().shrink_to_hi();
         let remove_span = semi_span.with_lo(block.span.hi());
 
@@ -101,7 +101,7 @@ impl SemicolonBlock {
         );
     }
 
-    fn semicolon_outside_block(&self, cx: &impl LintContext, block: &Block<'_>, tail_stmt_expr: &Expr<'_>) {
+    fn semicolon_outside_block(&self, cx: &impl LintContext, block: &Block, tail_stmt_expr: &Expr) {
         let insert_span = block.span.shrink_to_hi();
 
         // For macro call semicolon statements (`mac!();`), the statement's span does not actually
@@ -137,26 +137,27 @@ impl SemicolonBlock {
     }
 }
 
-impl LateLintPass<'_> for SemicolonBlock {
-    fn check_stmt(&mut self, cx: &LateContext<'_>, stmt: &Stmt<'_>) {
-        match stmt.kind {
+impl EarlyLintPass for SemicolonBlock {
+    fn check_stmt(&mut self, cx: &EarlyContext<'_>, stmt: &Stmt) {
+        match &stmt.kind {
             StmtKind::Expr(expr)
-                if let ExprKind::Block(block, _) = expr.kind
+                if let ExprKind::Block(block, _) = &expr.kind
                     && !block.span.from_expansion()
                     && stmt.span.contains(block.span) =>
             {
-                if block.expr.is_none()
-                    && let [.., stmt] = block.stmts
-                    && let StmtKind::Semi(expr) = stmt.kind
+                if let Some(stmt) = block.stmts.last()
+                    && let StmtKind::Semi(expr) = &stmt.kind
                 {
                     self.semicolon_outside_block(cx, block, expr);
                 }
             },
             StmtKind::Semi(expr)
-                if let ExprKind::Block(block, _) = expr.kind
+                if let ExprKind::Block(block, _) = &expr.kind
                     && !block.span.from_expansion() =>
             {
-                if let Some(tail) = block.expr {
+                if let Some(expr) = block.stmts.last()
+                    && let StmtKind::Expr(tail) = &expr.kind
+                {
                     self.semicolon_inside_block(cx, block, tail, stmt.span);
                 }
             },

tests/ui/semicolon_inside_block.fixed

@@ -90,16 +90,13 @@ fn main() {
 
 fn issue15380() {
     #[rustfmt::skip]
-    ( {0;0;}
-    //~^ semicolon_inside_block
+    ( {0;0});
 
     ({
-        //~^ semicolon_inside_block
-        0;
         0;
-    }
+        0
+    });
 
     #[rustfmt::skip]
-    (({0;}
-    //~^ semicolon_inside_block
+    (({0}))    ;
 }

tests/ui/semicolon_inside_block.rs

@@ -91,15 +91,12 @@ fn main() {
 fn issue15380() {
     #[rustfmt::skip]
     ( {0;0});
-    //~^ semicolon_inside_block
 
     ({
-        //~^ semicolon_inside_block
         0;
         0
     });
 
     #[rustfmt::skip]
     (({0}))    ;
-    //~^ semicolon_inside_block
 }

tests/ui/semicolon_inside_block.stderr

@@ -52,45 +52,5 @@ LL -     { m!(()) };
 LL +     { m!(()); }
    |
 
-error: consider moving the `;` inside the block for consistent formatting
-  --> tests/ui/semicolon_inside_block.rs:93:5
-   |
-LL |     ( {0;0});
-   |     ^^^^^^^^^
-   |
-help: put the `;` here
-   |
-LL -     ( {0;0});
-LL +     ( {0;0;}
-   |
-
-error: consider moving the `;` inside the block for consistent formatting
-  --> tests/ui/semicolon_inside_block.rs:96:5
-   |
-LL | /     ({
-LL | |
-LL | |         0;
-LL | |         0
-LL | |     });
-   | |_______^
-   |
-help: put the `;` here
-   |
-LL ~         0;
-LL ~     }
-   |
-
-error: consider moving the `;` inside the block for consistent formatting
-  --> tests/ui/semicolon_inside_block.rs:103:5
-   |
-LL |     (({0}))    ;
-   |     ^^^^^^^^^^^^
-   |
-help: put the `;` here
-   |
-LL -     (({0}))    ;
-LL +     (({0;}
-   |
-
-error: aborting due to 7 previous errors
+error: aborting due to 4 previous errors