Skip to content

Commit 0315daa

Browse files
eholkeholk
committed
Plumb awaitness of for loops
1 parent ca2472e commit 0315daa

File tree

5 files changed

+23
-13
lines changed

5 files changed

+23
-13
lines changed

‎src/closures.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ fn is_block_closure_forced(context: &RewriteContext<'_>, expr: &ast::Expr) -> bo
448448

449449
fn is_block_closure_forced_inner(expr: &ast::Expr, version: Version) -> bool {
450450
match expr.kind {
451-
ast::ExprKind::If(..) | ast::ExprKind::While(..) | ast::ExprKind::ForLoop(..) => true,
451+
ast::ExprKind::If(..) | ast::ExprKind::While(..) | ast::ExprKind::ForLoop { .. } => true,
452452
ast::ExprKind::Loop(..) if version == Version::Two => true,
453453
ast::ExprKind::AddrOf(_, _, ref expr)
454454
| ast::ExprKind::Try(ref expr)
@@ -473,7 +473,7 @@ fn expr_requires_semi_to_be_stmt(e: &ast::Expr) -> bool {
473473
| ast::ExprKind::Block(..)
474474
| ast::ExprKind::While(..)
475475
| ast::ExprKind::Loop(..)
476-
| ast::ExprKind::ForLoop(..)
476+
| ast::ExprKind::ForLoop { .. }
477477
| ast::ExprKind::TryBlock(..) => false,
478478
_ => true,
479479
}

‎src/expr.rs

+17-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::cmp::min;
33

44
use itertools::Itertools;
55
use rustc_ast::token::{Delimiter, Lit, LitKind};
6-
use rustc_ast::{ast, ptr, token};
6+
use rustc_ast::{ast, ptr, token, ForLoopKind};
77
use rustc_span::{BytePos, Span};
88

99
use crate::chains::rewrite_chain;
@@ -134,7 +134,7 @@ pub(crate) fn format_expr(
134134
}
135135
ast::ExprKind::Let(ref pat, ref expr, _span, _) => rewrite_let(context, shape, pat, expr),
136136
ast::ExprKind::If(..)
137-
| ast::ExprKind::ForLoop(..)
137+
| ast::ExprKind::ForLoop { .. }
138138
| ast::ExprKind::Loop(..)
139139
| ast::ExprKind::While(..) => to_control_flow(expr, expr_type)
140140
.and_then(|control_flow| control_flow.rewrite(context, shape)),
@@ -682,9 +682,15 @@ fn to_control_flow(expr: &ast::Expr, expr_type: ExprType) -> Option<ControlFlow<
682682
expr.span,
683683
))
684684
}
685-
ast::ExprKind::ForLoop(ref pat, ref cond, ref block, label) => {
686-
Some(ControlFlow::new_for(pat, cond, block, label, expr.span))
687-
}
685+
ast::ExprKind::ForLoop {
686+
ref pat,
687+
ref iter,
688+
ref body,
689+
label,
690+
kind,
691+
} => Some(ControlFlow::new_for(
692+
pat, iter, body, label, expr.span, kind,
693+
)),
688694
ast::ExprKind::Loop(ref block, label, _) => {
689695
Some(ControlFlow::new_loop(block, label, expr.span))
690696
}
@@ -771,14 +777,18 @@ impl<'a> ControlFlow<'a> {
771777
block: &'a ast::Block,
772778
label: Option<ast::Label>,
773779
span: Span,
780+
kind: ForLoopKind,
774781
) -> ControlFlow<'a> {
775782
ControlFlow {
776783
cond: Some(cond),
777784
block,
778785
else_block: None,
779786
label,
780787
pat: Some(pat),
781-
keyword: "for",
788+
keyword: match kind {
789+
ForLoopKind::For => "for",
790+
ForLoopKind::ForAwait => "for await",
791+
},
782792
matcher: "",
783793
connector: " in",
784794
allow_single_line: false,
@@ -1364,7 +1374,7 @@ pub(crate) fn can_be_overflowed_expr(
13641374
|| context.config.overflow_delimited_expr()
13651375
}
13661376
ast::ExprKind::If(..)
1367-
| ast::ExprKind::ForLoop(..)
1377+
| ast::ExprKind::ForLoop { .. }
13681378
| ast::ExprKind::Loop(..)
13691379
| ast::ExprKind::While(..) => {
13701380
context.config.combine_control_expr() && context.use_block_indent() && args_len == 1

‎src/matches.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ fn can_flatten_block_around_this(body: &ast::Expr) -> bool {
591591
ast::ExprKind::If(..) => false,
592592
// We do not allow collapsing a block around expression with condition
593593
// to avoid it being cluttered with match arm.
594-
ast::ExprKind::ForLoop(..) | ast::ExprKind::While(..) => false,
594+
ast::ExprKind::ForLoop { .. } | ast::ExprKind::While(..) => false,
595595
ast::ExprKind::Loop(..)
596596
| ast::ExprKind::Match(..)
597597
| ast::ExprKind::Block(..)

‎src/overflow.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ impl<'a> Context<'a> {
409409
// When overflowing the expressions which consists of a control flow
410410
// expression, avoid condition to use multi line.
411411
ast::ExprKind::If(..)
412-
| ast::ExprKind::ForLoop(..)
412+
| ast::ExprKind::ForLoop { .. }
413413
| ast::ExprKind::Loop(..)
414414
| ast::ExprKind::While(..)
415415
| ast::ExprKind::Match(..) => {

‎src/utils.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ pub(crate) fn semicolon_for_stmt(
295295
) -> bool {
296296
match stmt.kind {
297297
ast::StmtKind::Semi(ref expr) => match expr.kind {
298-
ast::ExprKind::While(..) | ast::ExprKind::Loop(..) | ast::ExprKind::ForLoop(..) => {
298+
ast::ExprKind::While(..) | ast::ExprKind::Loop(..) | ast::ExprKind::ForLoop { .. } => {
299299
false
300300
}
301301
ast::ExprKind::Break(..) | ast::ExprKind::Continue(..) | ast::ExprKind::Ret(..) => {
@@ -476,7 +476,7 @@ pub(crate) fn is_block_expr(context: &RewriteContext<'_>, expr: &ast::Expr, repr
476476
| ast::ExprKind::ConstBlock(..)
477477
| ast::ExprKind::Gen(..)
478478
| ast::ExprKind::Loop(..)
479-
| ast::ExprKind::ForLoop(..)
479+
| ast::ExprKind::ForLoop { .. }
480480
| ast::ExprKind::TryBlock(..)
481481
| ast::ExprKind::Match(..) => repr.contains('\n'),
482482
ast::ExprKind::Paren(ref expr)

0 commit comments

Comments
 (0)