From dcd70c0995a6773ba3f78c072a899c62329f6a41 Mon Sep 17 00:00:00 2001 From: Takayuki Maeda Date: Thu, 4 Aug 2022 11:51:25 +0900 Subject: return when captured argument is not a struct field --- compiler/rustc_builtin_macros/src/format.rs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'compiler/rustc_builtin_macros/src') diff --git a/compiler/rustc_builtin_macros/src/format.rs b/compiler/rustc_builtin_macros/src/format.rs index 1fdc312603d..515dedb23c2 100644 --- a/compiler/rustc_builtin_macros/src/format.rs +++ b/compiler/rustc_builtin_macros/src/format.rs @@ -1279,19 +1279,20 @@ pub fn expand_preparsed_format_args( let captured_arg_span = fmt_span.from_inner(InnerSpan::new(err.span.start, err.span.end)); let positional_args = args.iter().filter(|arg| !arg.named).collect::>(); - let mut suggestions = vec![(captured_arg_span, positional_args.len().to_string())]; if let Ok(arg) = ecx.source_map().span_to_snippet(captured_arg_span) { let span = match positional_args.last() { Some(arg) => arg.expr.span, None => fmt_sp, }; - suggestions.push((span.shrink_to_hi(), format!(", {}", arg))) + e.multipart_suggestion_verbose( + "consider using a positional formatting argument instead", + vec![ + (captured_arg_span, positional_args.len().to_string()), + (span.shrink_to_hi(), format!(", {}", arg)), + ], + Applicability::MachineApplicable, + ); } - e.multipart_suggestion_verbose( - "consider using a positional formatting argument instead", - suggestions, - Applicability::MachineApplicable, - ); } e.emit(); return DummyResult::raw_expr(sp, true); -- cgit 1.4.1-3-g733a5