Skip to content

Commit b8c28ed

Browse files
committed
Remove support for removed await!() macro-like
Adapting for changes due to rust-lang/rust#62293
1 parent e3f5cda commit b8c28ed

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

src/chains.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ impl ChainItemKind {
168168
let span = mk_sp(nested.span.hi(), field.span.hi());
169169
(kind, span)
170170
}
171-
ast::ExprKind::Await(ast::AwaitOrigin::FieldLike, ref nested) => {
171+
ast::ExprKind::Await(ref nested) => {
172172
let span = mk_sp(nested.span.hi(), expr.span.hi());
173173
(ChainItemKind::Await, span)
174174
}
@@ -396,7 +396,7 @@ impl Chain {
396396
}
397397
ast::ExprKind::Field(ref subexpr, _)
398398
| ast::ExprKind::Try(ref subexpr)
399-
| ast::ExprKind::Await(ast::AwaitOrigin::FieldLike, ref subexpr) => {
399+
| ast::ExprKind::Await(ref subexpr) => {
400400
Some(Self::convert_try(subexpr, context))
401401
}
402402
_ => None,

src/expr.rs

+1-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use std::borrow::Cow;
22
use std::cmp::min;
3-
use std::iter;
43

54
use itertools::Itertools;
65
use syntax::parse::token::DelimToken;
@@ -367,18 +366,7 @@ pub(crate) fn format_expr(
367366
))
368367
}
369368
}
370-
ast::ExprKind::Await(ast::AwaitOrigin::FieldLike, _) => rewrite_chain(expr, context, shape),
371-
ast::ExprKind::Await(ast::AwaitOrigin::MacroLike, ref nested) => {
372-
overflow::rewrite_with_parens(
373-
context,
374-
"await!",
375-
iter::once(nested),
376-
shape,
377-
expr.span,
378-
context.config.max_width(),
379-
None,
380-
)
381-
}
369+
ast::ExprKind::Await(_) => rewrite_chain(expr, context, shape),
382370
ast::ExprKind::Err => None,
383371
};
384372

0 commit comments

Comments
 (0)