Apply requested changes

IoaNNUwU · IoaNNUwU · commit 43a6f56ca782 · 2025-09-08T19:19:59.000+02:00
diff --git a/compiler/rustc_builtin_macros/src/format.rs b/compiler/rustc_builtin_macros/src/format.rs
@@ -768,38 +768,24 @@ fn report_missing_placeholders(
         // Show example if user didn't use any format specifiers
         let show_example = used.iter().all(|used| !used);
 
-        if !show_example && unused.len() > 1 {
-            diag.note(format!("consider adding {} format specifiers", unused.len()));
-        }
-
-        let original_fmt_str = if fmt_str.len() >= 1 { &fmt_str[..fmt_str.len() - 1] } else { "" };
-
-        if show_example && unused.len() == 1 {
-            diag.note("format specifiers use curly braces: `{}`");
+        if !show_example {
+            if unused.len() > 1 {
+                diag.note(format!("consider adding {} format specifiers", unused.len()));
+            }
+        } else {
+            let original_fmt_str =
+                if fmt_str.len() >= 1 { &fmt_str[..fmt_str.len() - 1] } else { "" };
 
-            diag.span_suggestion_verbose(
-                fmt_span,
-                "consider adding format specifier",
-                format!("\"{}{{}}\"", original_fmt_str),
-                Applicability::MaybeIncorrect,
-            );
-        }
+            let msg = if unused.len() == 1 {
+                "a format specifier".to_string()
+            } else {
+                format!("{} format specifiers", unused.len())
+            };
 
-        if show_example && unused.len() > 1 {
-            diag.note("format specifiers use curly braces: `{}`");
+            let sugg = format!("\"{}{}\"", original_fmt_str, "{}".repeat(unused.len()));
+            let msg = format!("format specifiers use curly braces, consider adding {msg}");
 
-            let mut suggest_fixed_fmt = format!("\"{}", original_fmt_str);
-            for _ in &unused {
-                suggest_fixed_fmt.push_str("{}");
-            }
-            suggest_fixed_fmt.push('"');
-
-            diag.span_suggestion_verbose(
-                fmt_span,
-                format!("consider adding {} format specifiers", unused.len()),
-                suggest_fixed_fmt,
-                Applicability::MaybeIncorrect,
-            );
+            diag.span_suggestion_verbose(fmt_span, msg, sugg, Applicability::MaybeIncorrect);
         }
     }
 
diff --git a/tests/ui/fmt/ifmt-bad-arg.stderr b/tests/ui/fmt/ifmt-bad-arg.stderr
@@ -63,8 +63,7 @@ LL |     format!("", 1, 2);
    |             |   argument never used
    |             multiple missing formatting specifiers
    |
-   = note: format specifiers use curly braces: `{}`
-help: consider adding 2 format specifiers
+help: format specifiers use curly braces, consider adding 2 format specifiers
    |
 LL |     format!("{}{}", 1, 2);
    |              ++++
@@ -109,8 +108,7 @@ LL |     format!("", foo=2);
    |             |
    |             formatting specifier missing
    |
-   = note: format specifiers use curly braces: `{}`
-help: consider adding format specifier
+help: format specifiers use curly braces, consider adding a format specifier
    |
 LL |     format!("{}", foo=2);
    |              ++
diff --git a/tests/ui/macros/format-unused-lables.stderr b/tests/ui/macros/format-unused-lables.stderr
@@ -8,8 +8,7 @@ LL |     println!("Test", 123, 456, 789);
    |              |       argument never used
    |              multiple missing formatting specifiers
    |
-   = note: format specifiers use curly braces: `{}`
-help: consider adding 3 format specifiers
+help: format specifiers use curly braces, consider adding 3 format specifiers
    |
 LL |     println!("Test{}{}{}", 123, 456, 789);
    |                   ++++++
@@ -26,8 +25,7 @@ LL |         456,
 LL |         789
    |         ^^^ argument never used
    |
-   = note: format specifiers use curly braces: `{}`
-help: consider adding 3 format specifiers
+help: format specifiers use curly braces, consider adding 3 format specifiers
    |
 LL |     println!("Test2{}{}{}",
    |                    ++++++
@@ -40,8 +38,7 @@ LL |     println!("Some stuff", UNUSED="args");
    |              |
    |              formatting specifier missing
    |
-   = note: format specifiers use curly braces: `{}`
-help: consider adding format specifier
+help: format specifiers use curly braces, consider adding a format specifier
    |
 LL |     println!("Some stuff{}", UNUSED="args");
    |                         ++
diff --git a/tests/ui/mir/unsized-extern-static.stderr b/tests/ui/mir/unsized-extern-static.stderr
@@ -6,8 +6,7 @@ LL |     println!("C", unsafe { &symbol });
    |              |
    |              formatting specifier missing
    |
-   = note: format specifiers use curly braces: `{}`
-help: consider adding format specifier
+help: format specifiers use curly braces, consider adding a format specifier
    |
 LL |     println!("C{}", unsafe { &symbol });
    |                ++
diff --git a/tests/ui/suggestions/missing-format-specifiers-issue-68293.rs b/tests/ui/suggestions/missing-format-specifiers-issue-68293.rs
@@ -2,18 +2,18 @@ fn no_format_specifier_two_unused_args() {
     println!("Hello", "World");
     //~^ ERROR argument never used
     //~| NOTE formatting specifier missing
-    //~| NOTE format specifiers use curly braces: `{}`
     //~| NOTE argument never used
+    //~| HELP format specifiers use curly braces, consider adding a format specifier
 }
 
 fn no_format_specifier_multiple_unused_args() {
     println!("list: ", 1, 2, 3);
     //~^ ERROR multiple unused formatting arguments
     //~| NOTE multiple missing formatting specifiers
-    //~| NOTE format specifiers use curly braces: `{}`
     //~| NOTE argument never used
     //~| NOTE argument never used
     //~| NOTE argument never used
+    //~| HELP format specifiers use curly braces, consider adding 3 format specifiers
 }
 
 fn missing_format_specifiers_one_unused_arg() {
diff --git a/tests/ui/suggestions/missing-format-specifiers-issue-68293.stderr b/tests/ui/suggestions/missing-format-specifiers-issue-68293.stderr
@@ -6,8 +6,7 @@ LL |     println!("Hello", "World");
    |              |
    |              formatting specifier missing
    |
-   = note: format specifiers use curly braces: `{}`
-help: consider adding format specifier
+help: format specifiers use curly braces, consider adding a format specifier
    |
 LL |     println!("Hello{}", "World");
    |                    ++
@@ -22,8 +21,7 @@ LL |     println!("list: ", 1, 2, 3);
    |              |         argument never used
    |              multiple missing formatting specifiers
    |
-   = note: format specifiers use curly braces: `{}`
-help: consider adding 3 format specifiers
+help: format specifiers use curly braces, consider adding 3 format specifiers
    |
 LL |     println!("list: {}{}{}", 1, 2, 3);
    |                     ++++++

Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,7 @@ LL \| format!("", 1, 2);`
`63`	`63`	`\| \| argument never used`
`64`	`64`	`\| multiple missing formatting specifiers`
`65`	`65`	`\|`
`66`		- = note: format specifiers use curly braces: `{}`
`67`		`-help: consider adding 2 format specifiers`
	`66`	`+help: format specifiers use curly braces, consider adding 2 format specifiers`
`68`	`67`	`\|`
`69`	`68`	`LL \| format!("{}{}", 1, 2);`
`70`	`69`	`\| ++++`
`@@ -109,8 +108,7 @@ LL \| format!("", foo=2);`
`109`	`108`	`\| \|`
`110`	`109`	`\| formatting specifier missing`
`111`	`110`	`\|`
`112`		- = note: format specifiers use curly braces: `{}`
`113`		`-help: consider adding format specifier`
	`111`	`+help: format specifiers use curly braces, consider adding a format specifier`
`114`	`112`	`\|`
`115`	`113`	`LL \| format!("{}", foo=2);`
`116`	`114`	`\| ++`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,7 @@ LL \| println!("Test", 123, 456, 789);`
`8`	`8`	`\| \| argument never used`
`9`	`9`	`\| multiple missing formatting specifiers`
`10`	`10`	`\|`
`11`		- = note: format specifiers use curly braces: `{}`
`12`		`-help: consider adding 3 format specifiers`
	`11`	`+help: format specifiers use curly braces, consider adding 3 format specifiers`
`13`	`12`	`\|`
`14`	`13`	`LL \| println!("Test{}{}{}", 123, 456, 789);`
`15`	`14`	`\| ++++++`
`@@ -26,8 +25,7 @@ LL \| 456,`
`26`	`25`	`LL \| 789`
`27`	`26`	`\| ^^^ argument never used`
`28`	`27`	`\|`
`29`		- = note: format specifiers use curly braces: `{}`
`30`		`-help: consider adding 3 format specifiers`
	`28`	`+help: format specifiers use curly braces, consider adding 3 format specifiers`
`31`	`29`	`\|`
`32`	`30`	`LL \| println!("Test2{}{}{}",`
`33`	`31`	`\| ++++++`
`@@ -40,8 +38,7 @@ LL \| println!("Some stuff", UNUSED="args");`
`40`	`38`	`\| \|`
`41`	`39`	`\| formatting specifier missing`
`42`	`40`	`\|`
`43`		- = note: format specifiers use curly braces: `{}`
`44`		`-help: consider adding format specifier`
	`41`	`+help: format specifiers use curly braces, consider adding a format specifier`
`45`	`42`	`\|`
`46`	`43`	`LL \| println!("Some stuff{}", UNUSED="args");`
`47`	`44`	`\| ++`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,7 @@ LL \| println!("C", unsafe { &symbol });`
`6`	`6`	`\| \|`
`7`	`7`	`\| formatting specifier missing`
`8`	`8`	`\|`
`9`		- = note: format specifiers use curly braces: `{}`
`10`		`-help: consider adding format specifier`
	`9`	`+help: format specifiers use curly braces, consider adding a format specifier`
`11`	`10`	`\|`
`12`	`11`	`LL \| println!("C{}", unsafe { &symbol });`
`13`	`12`	`\| ++`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,7 @@ LL \| println!("Hello", "World");`
`6`	`6`	`\| \|`
`7`	`7`	`\| formatting specifier missing`
`8`	`8`	`\|`
`9`		- = note: format specifiers use curly braces: `{}`
`10`		`-help: consider adding format specifier`
	`9`	`+help: format specifiers use curly braces, consider adding a format specifier`
`11`	`10`	`\|`
`12`	`11`	`LL \| println!("Hello{}", "World");`
`13`	`12`	`\| ++`
`@@ -22,8 +21,7 @@ LL \| println!("list: ", 1, 2, 3);`
`22`	`21`	`\| \| argument never used`
`23`	`22`	`\| multiple missing formatting specifiers`
`24`	`23`	`\|`
`25`		- = note: format specifiers use curly braces: `{}`
`26`		`-help: consider adding 3 format specifiers`
	`24`	`+help: format specifiers use curly braces, consider adding 3 format specifiers`
`27`	`25`	`\|`
`28`	`26`	`LL \| println!("list: {}{}{}", 1, 2, 3);`
`29`	`27`	`\| ++++++`