Skip to content

Commit e0919de

Browse files
committed
remove unnecessary nested blocks
1 parent 6af09d2 commit e0919de

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

compiler/rustc_resolve/src/late.rs

+8-12
Original file line numberDiff line numberDiff line change
@@ -2296,22 +2296,18 @@ impl<'a: 'ast, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
22962296

22972297
let prev = self.diagnostic_metadata.current_block_could_be_bare_struct_literal.take();
22982298
if let (true, [Stmt { kind: StmtKind::Expr(expr), .. }]) =
2299-
(block.could_be_bare_literal, &block.stmts[..])
2299+
(block.could_be_bare_literal, &block.stmts[..]) && let ExprKind::Type(..) = expr.kind
23002300
{
2301-
if let ExprKind::Type(..) = expr.kind {
2302-
self.diagnostic_metadata.current_block_could_be_bare_struct_literal =
2303-
Some(block.span);
2304-
}
2301+
self.diagnostic_metadata.current_block_could_be_bare_struct_literal =
2302+
Some(block.span);
23052303
}
23062304
// Descend into the block.
23072305
for stmt in &block.stmts {
2308-
if let StmtKind::Item(ref item) = stmt.kind {
2309-
if let ItemKind::MacroDef(..) = item.kind {
2310-
num_macro_definition_ribs += 1;
2311-
let res = self.r.local_def_id(item.id).to_def_id();
2312-
self.ribs[ValueNS].push(Rib::new(MacroDefinition(res)));
2313-
self.label_ribs.push(Rib::new(MacroDefinition(res)));
2314-
}
2306+
if let StmtKind::Item(ref item) = stmt.kind && let ItemKind::MacroDef(..) = item.kind {
2307+
num_macro_definition_ribs += 1;
2308+
let res = self.r.local_def_id(item.id).to_def_id();
2309+
self.ribs[ValueNS].push(Rib::new(MacroDefinition(res)));
2310+
self.label_ribs.push(Rib::new(MacroDefinition(res)));
23152311
}
23162312

23172313
self.visit_stmt(stmt);

0 commit comments

Comments
 (0)