diff --git a/src/libsyntax_ext/format.rs b/src/libsyntax_ext/format.rs index 3d22178eab05..023fe77cb3c1 100644 --- a/src/libsyntax_ext/format.rs +++ b/src/libsyntax_ext/format.rs @@ -928,7 +928,7 @@ pub fn expand_preparsed_format_args(ecx: &mut ExtCtxt, errs.iter().map(|&(sp, _)| sp).collect::>(), "multiple unused formatting arguments", ); - diag.span_label(cx.fmtsp, "multiple missing formatting arguments"); + diag.span_label(cx.fmtsp, "multiple missing formatting specifiers"); diag } }; diff --git a/src/test/ui/ifmt-bad-arg.stderr b/src/test/ui/ifmt-bad-arg.stderr index b02aa765d09a..92c44cf406be 100644 --- a/src/test/ui/ifmt-bad-arg.stderr +++ b/src/test/ui/ifmt-bad-arg.stderr @@ -80,7 +80,7 @@ error: multiple unused formatting arguments LL | format!("", 1, 2); //~ ERROR: multiple unused formatting arguments | -- ^ ^ | | - | multiple missing formatting arguments + | multiple missing formatting specifiers error: argument never used --> $DIR/ifmt-bad-arg.rs:43:22 @@ -118,7 +118,7 @@ error: multiple unused formatting arguments LL | format!("{} {}", 1, 2, foo=1, bar=2); //~ ERROR: multiple unused formatting arguments | ------- ^ ^ | | - | multiple missing formatting arguments + | multiple missing formatting specifiers error: duplicate argument named `foo` --> $DIR/ifmt-bad-arg.rs:50:33 diff --git a/src/test/ui/macros/format-foreign.stderr b/src/test/ui/macros/format-foreign.stderr index 401b2f6d67e3..83ff301dc19c 100644 --- a/src/test/ui/macros/format-foreign.stderr +++ b/src/test/ui/macros/format-foreign.stderr @@ -4,7 +4,7 @@ error: multiple unused formatting arguments LL | println!("%.*3$s %s!/n", "Hello,", "World", 4); //~ ERROR multiple unused formatting arguments | -------------- ^^^^^^^^ ^^^^^^^ ^ | | - | multiple missing formatting arguments + | multiple missing formatting specifiers | = help: `%.*3$s` should be written as `{:.2$}` = help: `%s` should be written as `{}` diff --git a/src/test/ui/macros/format-unused-lables.stderr b/src/test/ui/macros/format-unused-lables.stderr index f764190438f3..0b024facc8e3 100644 --- a/src/test/ui/macros/format-unused-lables.stderr +++ b/src/test/ui/macros/format-unused-lables.stderr @@ -4,13 +4,13 @@ error: multiple unused formatting arguments LL | println!("Test", 123, 456, 789); | ------ ^^^ ^^^ ^^^ | | - | multiple missing formatting arguments + | multiple missing formatting specifiers error: multiple unused formatting arguments --> $DIR/format-unused-lables.rs:16:9 | LL | println!("Test2", - | ------- multiple missing formatting arguments + | ------- multiple missing formatting specifiers LL | 123, //~ ERROR multiple unused formatting arguments | ^^^ LL | 456, @@ -28,7 +28,7 @@ error: multiple unused formatting arguments --> $DIR/format-unused-lables.rs:24:9 | LL | println!("Some more $STUFF", - | ------------------ multiple missing formatting arguments + | ------------------ multiple missing formatting specifiers LL | "woo!", //~ ERROR multiple unused formatting arguments | ^^^^^^ LL | STUFF=