From a428ab17abc310c17ca13eeb6f74b3c5bddff940 Mon Sep 17 00:00:00 2001 From: Mara Bos Date: Sun, 14 Feb 2021 18:52:47 +0100 Subject: Improve suggestion for panic!(format!(..)). --- library/alloc/src/macros.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'library/alloc/src') diff --git a/library/alloc/src/macros.rs b/library/alloc/src/macros.rs index a64a8b32ad7..88a6cec3a83 100644 --- a/library/alloc/src/macros.rs +++ b/library/alloc/src/macros.rs @@ -107,6 +107,7 @@ macro_rules! vec { /// ``` #[macro_export] #[stable(feature = "rust1", since = "1.0.0")] +#[rustc_diagnostic_item = "format_macro"] macro_rules! format { ($($arg:tt)*) => {{ let res = $crate::fmt::format($crate::__export::format_args!($($arg)*)); -- cgit 1.4.1-3-g733a5 From daa371d1891f6833ad08542caeb3cf424483a0f9 Mon Sep 17 00:00:00 2001 From: Mara Bos Date: Sun, 14 Feb 2021 20:03:13 +0100 Subject: Only define rustc_diagnostic_item format_macro in not(test). --- library/alloc/src/macros.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'library/alloc/src') diff --git a/library/alloc/src/macros.rs b/library/alloc/src/macros.rs index 88a6cec3a83..6a64587a223 100644 --- a/library/alloc/src/macros.rs +++ b/library/alloc/src/macros.rs @@ -107,7 +107,7 @@ macro_rules! vec { /// ``` #[macro_export] #[stable(feature = "rust1", since = "1.0.0")] -#[rustc_diagnostic_item = "format_macro"] +#[cfg_attr(not(test), rustc_diagnostic_item = "format_macro")] macro_rules! format { ($($arg:tt)*) => {{ let res = $crate::fmt::format($crate::__export::format_args!($($arg)*)); -- cgit 1.4.1-3-g733a5