From 10ebb2cbb291ead33e8e20519611e962b594db50 Mon Sep 17 00:00:00 2001 From: David Hewitt <1939362+davidhewitt@users.noreply.github.com> Date: Wed, 1 Jul 2020 11:35:17 +0100 Subject: [PATCH] Update src/librustc_builtin_macros/format.rs Apply suggestion from varkor Co-authored-by: varkor --- src/librustc_builtin_macros/format.rs | 2 +- src/test/ui/fmt/format-args-capture-macro-hygiene.stderr | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/librustc_builtin_macros/format.rs b/src/librustc_builtin_macros/format.rs index 019432035fe..4cc83f8e31c 100644 --- a/src/librustc_builtin_macros/format.rs +++ b/src/librustc_builtin_macros/format.rs @@ -537,7 +537,7 @@ fn verify_arg_type(&mut self, arg: Position, ty: ArgumentType) { name )); err.note( - "to avoid ambiguity format_args! cannot capture variables \ + "to avoid ambiguity, `format_args!` cannot capture variables \ when the format string is expanded from a macro", ); } else if self.ecx.parse_sess().unstable_features.is_nightly_build() { diff --git a/src/test/ui/fmt/format-args-capture-macro-hygiene.stderr b/src/test/ui/fmt/format-args-capture-macro-hygiene.stderr index 55bd97bafe8..0c5915149cd 100644 --- a/src/test/ui/fmt/format-args-capture-macro-hygiene.stderr +++ b/src/test/ui/fmt/format-args-capture-macro-hygiene.stderr @@ -5,7 +5,7 @@ LL | format!(concat!("{foo}")); | ^^^^^^^^^^^^^^^^ | = note: did you intend to capture a variable `foo` from the surrounding scope? - = note: to avoid ambiguity format_args! cannot capture variables when the format string is expanded from a macro + = note: to avoid ambiguity, `format_args!` cannot capture variables when the format string is expanded from a macro = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) error: there is no argument named `bar` @@ -15,7 +15,7 @@ LL | format!(concat!("{ba", "r} {}"), 1); | ^^^^^^^^^^^^^^^^^^^^^^^ | = note: did you intend to capture a variable `bar` from the surrounding scope? - = note: to avoid ambiguity format_args! cannot capture variables when the format string is expanded from a macro + = note: to avoid ambiguity, `format_args!` cannot capture variables when the format string is expanded from a macro = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) error: aborting due to 2 previous errors -- GitLab