1
Fork 0

Update rustfmt for ast::ExprKind::FormatArgs.

Rustfmt doesn't expand macros, so that's easy: FormatArgs nodes do not
occur in the unexpanded AST.
This commit is contained in:
Mara Bos 2023-01-11 22:25:29 +01:00
parent c878caf835
commit a1725fa1d5
2 changed files with 5 additions and 1 deletions

View file

@ -399,7 +399,10 @@ pub(crate) fn format_expr(
} }
} }
ast::ExprKind::Underscore => Some("_".to_owned()), ast::ExprKind::Underscore => Some("_".to_owned()),
ast::ExprKind::IncludedBytes(..) => unreachable!(), ast::ExprKind::FormatArgs(..) | ast::ExprKind::IncludedBytes(..) => {
// These do not occur in the AST because macros aren't expanded.
unreachable!()
}
ast::ExprKind::Err => None, ast::ExprKind::Err => None,
}; };

View file

@ -462,6 +462,7 @@ pub(crate) fn first_line_ends_with(s: &str, c: char) -> bool {
pub(crate) fn is_block_expr(context: &RewriteContext<'_>, expr: &ast::Expr, repr: &str) -> bool { pub(crate) fn is_block_expr(context: &RewriteContext<'_>, expr: &ast::Expr, repr: &str) -> bool {
match expr.kind { match expr.kind {
ast::ExprKind::MacCall(..) ast::ExprKind::MacCall(..)
| ast::ExprKind::FormatArgs(..)
| ast::ExprKind::Call(..) | ast::ExprKind::Call(..)
| ast::ExprKind::MethodCall(..) | ast::ExprKind::MethodCall(..)
| ast::ExprKind::Array(..) | ast::ExprKind::Array(..)