user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove the semicolon for builtin macro call statements in statement_outside_block

Browse source 
The expansion of `asm!()` and `line!()` is not marked as from an expansion, in which case `SourceMap::stmt_span` returns the input span unchanged. So instead of using `stmt_span`, use `mac_call_stmt_semi_span` directly
This commit is contained in:
y21 2024-10-20 19:00:55 +02:00
parent 4de65a113f
commit 65eb1ec0fb
4 changed files with 60 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
clippy_lints/src/semicolon_block.rs
View file

@ -101,17 +101,21 @@ impl SemicolonBlock {
);
}
fn semicolon_outside_block(
&self,
cx: &LateContext<'_>,
block: &Block<'_>,
tail_stmt_expr: &Expr<'_>,
semi_span: Span,
) {
fn semicolon_outside_block(&self, cx: &LateContext<'_>, block: &Block<'_>, tail_stmt_expr: &Expr<'_>) {
let insert_span = block.span.with_lo(block.span.hi());
// account for macro calls
let semi_span = cx.sess().source_map().stmt_span(semi_span, block.span);
let remove_span = semi_span.with_lo(tail_stmt_expr.span.source_callsite().hi());
// For macro call semicolon statements (`mac!();`), the statement's span does not actually
// include the semicolon itself, so use `mac_call_stmt_semi_span`, which finds the semicolon
// based on a source snippet.
// (Does not use `stmt_span` as that requires `.from_expansion()` to return true,
// which is not the case for e.g. `line!();` and `asm!();`)
let Some(remove_span) = cx
.sess()
.source_map()
.mac_call_stmt_semi_span(tail_stmt_expr.span.source_callsite())
else {
return;
};
if self.semicolon_outside_block_ignore_multiline && get_line(cx, remove_span) != get_line(cx, insert_span) {
return;
@ -150,13 +154,12 @@ impl LateLintPass<'_> for SemicolonBlock {
};
let &Stmt {
kind: StmtKind::Semi(expr),
span,
..
} = stmt
else {
return;
};
self.semicolon_outside_block(cx, block, expr, span);
self.semicolon_outside_block(cx, block, expr);
},
StmtKind::Semi(Expr {
kind: ExprKind::Block(block @ Block { expr: Some(tail), .. }, _),