Skip to content

Commit 01d99f6

Browse files
authored
Rollup merge of #106365 - gimbles:patch-1, r=jyn514
Grammar : Missing "is" in format specifier diagnostic
2 parents a0458d4 + f8755ab commit 01d99f6

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

compiler/rustc_builtin_macros/src/format.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ fn report_missing_placeholders(
638638
if show_doc_note {
639639
diag.note(concat!(
640640
stringify!($kind),
641-
" formatting not supported; see the documentation for `std::fmt`",
641+
" formatting is not supported; see the documentation for `std::fmt`",
642642
));
643643
}
644644
if suggestions.len() > 0 {

src/test/ui/fmt/ifmt-bad-arg.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ LL | format!("foo %s baz", "bar");
170170
| |
171171
| help: format specifiers use curly braces: `{}`
172172
|
173-
= note: printf formatting not supported; see the documentation for `std::fmt`
173+
= note: printf formatting is not supported; see the documentation for `std::fmt`
174174

175175
error: invalid format string: expected `'}'`, found `'t'`
176176
--> $DIR/ifmt-bad-arg.rs:75:1

src/test/ui/fmt/issue-89173.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ fn main() {
1010
//~| NOTE: argument never used
1111
//~| NOTE: argument never used
1212
//~| NOTE: format specifiers use curly braces, and you have to use a positional or named parameter for the width
13-
//~| NOTE: printf formatting not supported
13+
//~| NOTE: printf formatting is not supported
1414
}

src/test/ui/fmt/issue-89173.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ note: format specifiers use curly braces, and you have to use a positional or na
1212
|
1313
LL | print!("%0*x", width, num);
1414
| ^^^^
15-
= note: printf formatting not supported; see the documentation for `std::fmt`
15+
= note: printf formatting is not supported; see the documentation for `std::fmt`
1616

1717
error: aborting due to previous error
1818

src/test/ui/macros/format-foreign.stderr

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | println!("%.*3$s %s!\n", "Hello,", "World", 4);
88
| | argument never used
99
| multiple missing formatting specifiers
1010
|
11-
= note: printf formatting not supported; see the documentation for `std::fmt`
11+
= note: printf formatting is not supported; see the documentation for `std::fmt`
1212
help: format specifiers use curly braces
1313
|
1414
LL | println!("{:.2$} {}!\n", "Hello,", "World", 4);
@@ -22,7 +22,7 @@ LL | println!("%1$*2$.*3$f", 123.456);
2222
| |
2323
| help: format specifiers use curly braces: `{0:1$.2$}`
2424
|
25-
= note: printf formatting not supported; see the documentation for `std::fmt`
25+
= note: printf formatting is not supported; see the documentation for `std::fmt`
2626

2727
error: multiple unused formatting arguments
2828
--> $DIR/format-foreign.rs:6:7
@@ -37,7 +37,7 @@ LL | | "###, "Hello,", "World", 4);
3737
| |____| argument never used
3838
| multiple missing formatting specifiers
3939
|
40-
= note: printf formatting not supported; see the documentation for `std::fmt`
40+
= note: printf formatting is not supported; see the documentation for `std::fmt`
4141
help: format specifiers use curly braces
4242
|
4343
LL ~ println!(r###"{:.2$}
@@ -60,7 +60,7 @@ LL | println!("Hi there, $NAME.", NAME="Tim");
6060
| |
6161
| help: format specifiers use curly braces: `{NAME}`
6262
|
63-
= note: shell formatting not supported; see the documentation for `std::fmt`
63+
= note: shell formatting is not supported; see the documentation for `std::fmt`
6464

6565
error: multiple unused formatting arguments
6666
--> $DIR/format-foreign.rs:15:32
@@ -72,7 +72,7 @@ LL | println!("$1 $0 $$ $NAME", 1, 2, NAME=3);
7272
| | argument never used
7373
| multiple missing formatting specifiers
7474
|
75-
= note: shell formatting not supported; see the documentation for `std::fmt`
75+
= note: shell formatting is not supported; see the documentation for `std::fmt`
7676
help: format specifiers use curly braces
7777
|
7878
LL | println!("{1} {0} $$ {NAME}", 1, 2, NAME=3);

src/test/ui/macros/format-unused-lables.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ LL | "things"
4444
LL | , UNUSED="args");
4545
| ^^^^^^ named argument never used
4646
|
47-
= note: shell formatting not supported; see the documentation for `std::fmt`
47+
= note: shell formatting is not supported; see the documentation for `std::fmt`
4848

4949
error: aborting due to 4 previous errors
5050

src/test/ui/macros/issue-92267.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ note: format specifiers use curly braces, and the conversion specifier `
1010
|
1111
LL | pub fn main() { println!("🦀%%%", 0) }
1212
| ^^
13-
= note: printf formatting not supported; see the documentation for `std::fmt`
13+
= note: printf formatting is not supported; see the documentation for `std::fmt`
1414

1515
error: aborting due to previous error
1616

0 commit comments

Comments
 (0)