Skip to content

Commit aa9c8ce

Browse files
committed
Remove 1-argument special case from format_args!().
The argument needs to be lifetime-extended, so this special case isn't actually perfectly equivalent to the general case.
1 parent 5fb947f commit aa9c8ce

File tree

1 file changed

+0
-20
lines changed

1 file changed

+0
-20
lines changed

compiler/rustc_ast_lowering/src/format.rs

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -487,26 +487,6 @@ fn expand_format_args<'hir>(
487487
// Generate:
488488
// []
489489
(vec![], ctx.arena.alloc(ctx.expr(macsp, hir::ExprKind::Array(&[]))))
490-
} else if argmap.len() == 1 && arguments.len() == 1 {
491-
// Only one argument, so we don't need to make the `args` tuple.
492-
//
493-
// Generate:
494-
// super let args = [<core::fmt::Argument>::new_display(&arg)];
495-
let args = ctx.arena.alloc_from_iter(argmap.iter().map(
496-
|(&(arg_index, ty), &placeholder_span)| {
497-
let arg = &arguments[arg_index];
498-
let placeholder_span =
499-
placeholder_span.unwrap_or(arg.expr.span).with_ctxt(macsp.ctxt());
500-
let arg = ctx.lower_expr(&arg.expr);
501-
let ref_arg = ctx.arena.alloc(ctx.expr_ref(arg.span.with_ctxt(macsp.ctxt()), arg));
502-
make_argument(ctx, placeholder_span, ref_arg, ty)
503-
},
504-
));
505-
let args = ctx.arena.alloc(ctx.expr(macsp, hir::ExprKind::Array(args)));
506-
let args_ident = Ident::new(sym::args, macsp);
507-
let (args_pat, args_hir_id) = ctx.pat_ident(macsp, args_ident);
508-
let let_statement = ctx.stmt_super_let_pat(macsp, args_pat, Some(args));
509-
(vec![let_statement], ctx.arena.alloc(ctx.expr_ident_mut(macsp, args_ident, args_hir_id)))
510490
} else {
511491
// Generate:
512492
// super let args = (&arg0, &arg1, &…);

0 commit comments

Comments
 (0)