Skip to content

Commit d2039c8

Browse files
committed
Fix formatting of let chains
1 parent 7a8ce2f commit d2039c8

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

clippy_lints/src/semicolon_block.rs

+10-8
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ impl LateLintPass<'_> for SemicolonBlock {
7373

7474
fn semicolon_inside_block(cx: &LateContext<'_>, block: &Block<'_>) {
7575
if !block.span.from_expansion()
76-
&& let Some(tail) = block.expr
77-
&& let Some(block_expr @ Expr { kind: ExprKind::Block(_, _), ..}) = get_parent_expr_for_hir(cx, block.hir_id)
78-
&& let Some(Node::Stmt(Stmt { kind: StmtKind::Semi(_), span, .. })) = get_parent_node(cx.tcx, block_expr.hir_id)
76+
&& let Some(tail) = block.expr
77+
&& let Some(block_expr @ Expr { kind: ExprKind::Block(_, _), ..}) = get_parent_expr_for_hir(cx, block.hir_id)
78+
&& let Some(Node::Stmt(Stmt { kind: StmtKind::Semi(_), span, .. })) = get_parent_node(cx.tcx, block_expr.hir_id)
7979
{
8080
let expr_snip = snippet_with_macro_callsite(cx, tail.span, "..");
8181

@@ -101,16 +101,18 @@ fn semicolon_inside_block(cx: &LateContext<'_>, block: &Block<'_>) {
101101

102102
fn semicolon_outside_block(cx: &LateContext<'_>, block: &Block<'_>) {
103103
if !block.span.from_expansion()
104-
&& block.expr.is_none()
105-
&& let [.., Stmt { kind: StmtKind::Semi(expr), .. }] = block.stmts
106-
&& let Some(block_expr @ Expr { kind: ExprKind::Block(_, _), ..}) = get_parent_expr_for_hir(cx,block.hir_id)
107-
&& let Some(Node::Stmt(Stmt { kind: StmtKind::Expr(_), .. })) = get_parent_node(cx.tcx, block_expr.hir_id) {
104+
&& block.expr.is_none()
105+
&& let [.., Stmt { kind: StmtKind::Semi(expr), .. }] = block.stmts
106+
&& let Some(block_expr @ Expr { kind: ExprKind::Block(_, _), ..}) = get_parent_expr_for_hir(cx,block.hir_id)
107+
&& let Some(Node::Stmt(Stmt { kind: StmtKind::Expr(_), .. })) = get_parent_node(cx.tcx, block_expr.hir_id)
108+
{
108109
let expr_snip = snippet_with_macro_callsite(cx, expr.span, "..");
109110

110111
let mut suggestion: String = snippet_with_macro_callsite(cx, block.span, "..").to_string();
111112

112113
if let Some((expr_offset, _)) = suggestion.rmatch_indices(&*expr_snip).next()
113-
&& let Some(semi_offset) = suggestion[expr_offset + expr_snip.len()..].find(';') {
114+
&& let Some(semi_offset) = suggestion[expr_offset + expr_snip.len()..].find(';')
115+
{
114116
suggestion.remove(expr_offset + expr_snip.len() + semi_offset);
115117
} else {
116118
return;

0 commit comments

Comments
 (0)