Show correct macro name in non_fmt_panics message.

m-ou-se · m-ou-se · commit ab8cbc31905c · 2021-08-16T17:39:50.000+02:00
diff --git a/compiler/rustc_lint/src/non_fmt_panic.rs b/compiler/rustc_lint/src/non_fmt_panic.rs
@@ -102,7 +102,7 @@ fn check_panic<'tcx>(cx: &LateContext<'tcx>, f: &'tcx hir::Expr<'tcx>, arg: &'tc
 
     cx.struct_span_lint(NON_FMT_PANICS, arg_span, |lint| {
         let mut l = lint.build("panic message is not a string literal");
-        l.note("this usage of panic!() is deprecated; it will be a hard error in Rust 2021");
+        l.note(&format!("this usage of {}!() is deprecated; it will be a hard error in Rust 2021", symbol_str));
         l.note("for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html>");
         if !span.contains(arg_span) {
             // No clue where this argument is coming from.
diff --git a/src/test/ui/non-fmt-panic.stderr b/src/test/ui/non-fmt-panic.stderr
@@ -61,7 +61,7 @@ warning: panic message is not a string literal
 LL |     assert!(false, S);
    |                    ^
    |
-   = note: this usage of panic!() is deprecated; it will be a hard error in Rust 2021
+   = note: this usage of assert!() is deprecated; it will be a hard error in Rust 2021
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html>
 help: add a "{}" format string to Display the message
    |
@@ -74,7 +74,7 @@ warning: panic message is not a string literal
 LL |     assert!(false, 123);
    |                    ^^^
    |
-   = note: this usage of panic!() is deprecated; it will be a hard error in Rust 2021
+   = note: this usage of assert!() is deprecated; it will be a hard error in Rust 2021
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html>
 help: add a "{}" format string to Display the message
    |
@@ -87,7 +87,7 @@ warning: panic message is not a string literal
 LL |     assert!(false, Some(123));
    |                    ^^^^^^^^^
    |
-   = note: this usage of panic!() is deprecated; it will be a hard error in Rust 2021
+   = note: this usage of assert!() is deprecated; it will be a hard error in Rust 2021
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html>
 help: add a "{:?}" format string to use the Debug implementation of `Option<i32>`
    |
@@ -138,7 +138,7 @@ warning: panic message is not a string literal
 LL |     std::panic!(123);
    |                 ^^^
    |
-   = note: this usage of panic!() is deprecated; it will be a hard error in Rust 2021
+   = note: this usage of std::panic!() is deprecated; it will be a hard error in Rust 2021
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html>
 help: add a "{}" format string to Display the message
    |
@@ -155,7 +155,7 @@ warning: panic message is not a string literal
 LL |     core::panic!(&*"abc");
    |                  ^^^^^^^
    |
-   = note: this usage of panic!() is deprecated; it will be a hard error in Rust 2021
+   = note: this usage of core::panic!() is deprecated; it will be a hard error in Rust 2021
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html>
 help: add a "{}" format string to Display the message
    |
@@ -253,7 +253,7 @@ warning: panic message is not a string literal
 LL |     assert!(false, format!("{}", 1));
    |                    ^^^^^^^^^^^^^^^^
    |
-   = note: this usage of panic!() is deprecated; it will be a hard error in Rust 2021
+   = note: this usage of assert!() is deprecated; it will be a hard error in Rust 2021
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html>
    = note: the assert!() macro supports formatting, so there's no need for the format!() macro here
 help: remove the `format!(..)` macro call
@@ -268,7 +268,7 @@ warning: panic message is not a string literal
 LL |     debug_assert!(false, format!("{}", 1));
    |                          ^^^^^^^^^^^^^^^^
    |
-   = note: this usage of panic!() is deprecated; it will be a hard error in Rust 2021
+   = note: this usage of debug_assert!() is deprecated; it will be a hard error in Rust 2021
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html>
    = note: the debug_assert!() macro supports formatting, so there's no need for the format!() macro here
 help: remove the `format!(..)` macro call
@@ -328,7 +328,7 @@ warning: panic message is not a string literal
 LL |     assert!(false, v);
    |                    ^
    |
-   = note: this usage of panic!() is deprecated; it will be a hard error in Rust 2021
+   = note: this usage of assert!() is deprecated; it will be a hard error in Rust 2021
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html>
 
 warning: panic message is not a string literal
@@ -354,7 +354,7 @@ warning: panic message is not a string literal
 LL |     assert!(false, v);
    |                    ^
    |
-   = note: this usage of panic!() is deprecated; it will be a hard error in Rust 2021
+   = note: this usage of assert!() is deprecated; it will be a hard error in Rust 2021
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html>
 help: add a "{:?}" format string to use the Debug implementation of `T`
    |
@@ -384,7 +384,7 @@ warning: panic message is not a string literal
 LL |     assert!(false, v);
    |                    ^
    |
-   = note: this usage of panic!() is deprecated; it will be a hard error in Rust 2021
+   = note: this usage of assert!() is deprecated; it will be a hard error in Rust 2021
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html>
 help: add a "{}" format string to Display the message
    |
@@ -414,7 +414,7 @@ warning: panic message is not a string literal
 LL |     assert!(false, v);
    |                    ^
    |
-   = note: this usage of panic!() is deprecated; it will be a hard error in Rust 2021
+   = note: this usage of assert!() is deprecated; it will be a hard error in Rust 2021
    = note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html>
 help: add a "{}" format string to Display the message
    |

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ warning: panic message is not a string literal`
`61`	`61`	`LL \| assert!(false, S);`
`62`	`62`	`\| ^`
`63`	`63`	`\|`
`64`		`- = note: this usage of panic!() is deprecated; it will be a hard error in Rust 2021`
	`64`	`+ = note: this usage of assert!() is deprecated; it will be a hard error in Rust 2021`
`65`	`65`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html>`
`66`	`66`	`help: add a "{}" format string to Display the message`
`67`	`67`	`\|`
`@@ -74,7 +74,7 @@ warning: panic message is not a string literal`
`74`	`74`	`LL \| assert!(false, 123);`
`75`	`75`	`\| ^^^`
`76`	`76`	`\|`
`77`		`- = note: this usage of panic!() is deprecated; it will be a hard error in Rust 2021`
	`77`	`+ = note: this usage of assert!() is deprecated; it will be a hard error in Rust 2021`
`78`	`78`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html>`
`79`	`79`	`help: add a "{}" format string to Display the message`
`80`	`80`	`\|`
`@@ -87,7 +87,7 @@ warning: panic message is not a string literal`
`87`	`87`	`LL \| assert!(false, Some(123));`
`88`	`88`	`\| ^^^^^^^^^`
`89`	`89`	`\|`
`90`		`- = note: this usage of panic!() is deprecated; it will be a hard error in Rust 2021`
	`90`	`+ = note: this usage of assert!() is deprecated; it will be a hard error in Rust 2021`
`91`	`91`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html>`
`92`	`92`	help: add a "{:?}" format string to use the Debug implementation of `Option<i32>`
`93`	`93`	`\|`
`@@ -138,7 +138,7 @@ warning: panic message is not a string literal`
`138`	`138`	`LL \| std::panic!(123);`
`139`	`139`	`\| ^^^`
`140`	`140`	`\|`
`141`		`- = note: this usage of panic!() is deprecated; it will be a hard error in Rust 2021`
	`141`	`+ = note: this usage of std::panic!() is deprecated; it will be a hard error in Rust 2021`
`142`	`142`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html>`
`143`	`143`	`help: add a "{}" format string to Display the message`
`144`	`144`	`\|`
`@@ -155,7 +155,7 @@ warning: panic message is not a string literal`
`155`	`155`	`LL \| core::panic!(&*"abc");`
`156`	`156`	`\| ^^^^^^^`
`157`	`157`	`\|`
`158`		`- = note: this usage of panic!() is deprecated; it will be a hard error in Rust 2021`
	`158`	`+ = note: this usage of core::panic!() is deprecated; it will be a hard error in Rust 2021`
`159`	`159`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html>`
`160`	`160`	`help: add a "{}" format string to Display the message`
`161`	`161`	`\|`
`@@ -253,7 +253,7 @@ warning: panic message is not a string literal`
`253`	`253`	`LL \| assert!(false, format!("{}", 1));`
`254`	`254`	`\| ^^^^^^^^^^^^^^^^`
`255`	`255`	`\|`
`256`		`- = note: this usage of panic!() is deprecated; it will be a hard error in Rust 2021`
	`256`	`+ = note: this usage of assert!() is deprecated; it will be a hard error in Rust 2021`
`257`	`257`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html>`
`258`	`258`	`= note: the assert!() macro supports formatting, so there's no need for the format!() macro here`
`259`	`259`	help: remove the `format!(..)` macro call
`@@ -268,7 +268,7 @@ warning: panic message is not a string literal`
`268`	`268`	`LL \| debug_assert!(false, format!("{}", 1));`
`269`	`269`	`\| ^^^^^^^^^^^^^^^^`
`270`	`270`	`\|`
`271`		`- = note: this usage of panic!() is deprecated; it will be a hard error in Rust 2021`
	`271`	`+ = note: this usage of debug_assert!() is deprecated; it will be a hard error in Rust 2021`
`272`	`272`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html>`
`273`	`273`	`= note: the debug_assert!() macro supports formatting, so there's no need for the format!() macro here`
`274`	`274`	help: remove the `format!(..)` macro call
`@@ -328,7 +328,7 @@ warning: panic message is not a string literal`
`328`	`328`	`LL \| assert!(false, v);`
`329`	`329`	`\| ^`
`330`	`330`	`\|`
`331`		`- = note: this usage of panic!() is deprecated; it will be a hard error in Rust 2021`
	`331`	`+ = note: this usage of assert!() is deprecated; it will be a hard error in Rust 2021`
`332`	`332`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html>`
`333`	`333`
`334`	`334`	`warning: panic message is not a string literal`
`@@ -354,7 +354,7 @@ warning: panic message is not a string literal`
`354`	`354`	`LL \| assert!(false, v);`
`355`	`355`	`\| ^`
`356`	`356`	`\|`
`357`		`- = note: this usage of panic!() is deprecated; it will be a hard error in Rust 2021`
	`357`	`+ = note: this usage of assert!() is deprecated; it will be a hard error in Rust 2021`
`358`	`358`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html>`
`359`	`359`	help: add a "{:?}" format string to use the Debug implementation of `T`
`360`	`360`	`\|`
`@@ -384,7 +384,7 @@ warning: panic message is not a string literal`
`384`	`384`	`LL \| assert!(false, v);`
`385`	`385`	`\| ^`
`386`	`386`	`\|`
`387`		`- = note: this usage of panic!() is deprecated; it will be a hard error in Rust 2021`
	`387`	`+ = note: this usage of assert!() is deprecated; it will be a hard error in Rust 2021`
`388`	`388`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html>`
`389`	`389`	`help: add a "{}" format string to Display the message`
`390`	`390`	`\|`
`@@ -414,7 +414,7 @@ warning: panic message is not a string literal`
`414`	`414`	`LL \| assert!(false, v);`
`415`	`415`	`\| ^`
`416`	`416`	`\|`
`417`		`- = note: this usage of panic!() is deprecated; it will be a hard error in Rust 2021`
	`417`	`+ = note: this usage of assert!() is deprecated; it will be a hard error in Rust 2021`
`418`	`418`	`= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/panic-macro-consistency.html>`
`419`	`419`	`help: add a "{}" format string to Display the message`
`420`	`420`	`\|`