Skip to content

Commit 7ea03db

Browse files
AlexendooAlexendoo
committed
Add diagnostic items for macros
1 parent f1ce0e6 commit 7ea03db

File tree

5 files changed

+62
-0
lines changed

5 files changed

+62
-0
lines changed

‎compiler/rustc_span/src/symbol.rs

+31
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,10 @@ symbols! {
334334
asm_sym,
335335
asm_unwind,
336336
assert,
337+
assert_eq_macro,
337338
assert_inhabited,
338339
assert_macro,
340+
assert_ne_macro,
339341
assert_receiver_is_total_eq,
340342
assert_uninit_valid,
341343
assert_zero_valid,
@@ -405,6 +407,7 @@ symbols! {
405407
cfg_doctest,
406408
cfg_eval,
407409
cfg_hide,
410+
cfg_macro,
408411
cfg_panic,
409412
cfg_sanitize,
410413
cfg_target_abi,
@@ -432,15 +435,18 @@ symbols! {
432435
coerce_unsized,
433436
cold,
434437
column,
438+
column_macro,
435439
compare_and_swap,
436440
compare_exchange,
437441
compare_exchange_weak,
438442
compile_error,
443+
compile_error_macro,
439444
compiler_builtins,
440445
compiler_fence,
441446
concat,
442447
concat_bytes,
443448
concat_idents,
449+
concat_macro,
444450
conservative_impl_trait,
445451
console,
446452
const_allocate,
@@ -520,10 +526,13 @@ symbols! {
520526
custom_inner_attributes,
521527
custom_test_frameworks,
522528
d,
529+
dbg_macro,
523530
dead_code,
524531
dealloc,
525532
debug,
533+
debug_assert_eq_macro,
526534
debug_assert_macro,
535+
debug_assert_ne_macro,
527536
debug_assertions,
528537
debug_struct,
529538
debug_trait_builder,
@@ -593,6 +602,9 @@ symbols! {
593602
enclosing_scope,
594603
encode,
595604
env,
605+
env_macro,
606+
eprint_macro,
607+
eprintln_macro,
596608
eq,
597609
ermsb_target_feature,
598610
exact_div,
@@ -640,6 +652,7 @@ symbols! {
640652
field,
641653
field_init_shorthand,
642654
file,
655+
file_macro,
643656
fill,
644657
finish,
645658
flags,
@@ -662,6 +675,7 @@ symbols! {
662675
format,
663676
format_args,
664677
format_args_capture,
678+
format_args_macro,
665679
format_args_nl,
666680
format_macro,
667681
freeze,
@@ -728,7 +742,10 @@ symbols! {
728742
in_band_lifetimes,
729743
include,
730744
include_bytes,
745+
include_bytes_macro,
746+
include_macro,
731747
include_str,
748+
include_str_macro,
732749
inclusive_range_syntax,
733750
index,
734751
index_mut,
@@ -776,6 +793,7 @@ symbols! {
776793
lifetime,
777794
likely,
778795
line,
796+
line_macro,
779797
link,
780798
link_args,
781799
link_cfg,
@@ -819,6 +837,7 @@ symbols! {
819837
masked,
820838
match_beginning_vert,
821839
match_default_bindings,
840+
matches_macro,
822841
maxnumf32,
823842
maxnumf64,
824843
may_dangle,
@@ -855,6 +874,7 @@ symbols! {
855874
modifiers,
856875
module,
857876
module_path,
877+
module_path_macro,
858878
more_qualified_paths,
859879
more_struct_aliases,
860880
movbe_target_feature,
@@ -938,6 +958,7 @@ symbols! {
938958
optin_builtin_traits,
939959
option,
940960
option_env,
961+
option_env_macro,
941962
options,
942963
or,
943964
or_patterns,
@@ -1001,6 +1022,8 @@ symbols! {
10011022
prelude_import,
10021023
preserves_flags,
10031024
primitive,
1025+
print_macro,
1026+
println_macro,
10041027
proc_dash_macro: "proc-macro",
10051028
proc_macro,
10061029
proc_macro_attribute,
@@ -1288,6 +1311,7 @@ symbols! {
12881311
str,
12891312
str_alloc,
12901313
stringify,
1314+
stringify_macro,
12911315
struct_field_attributes,
12921316
struct_inherit,
12931317
struct_variant,
@@ -1331,6 +1355,8 @@ symbols! {
13311355
then_with,
13321356
thread,
13331357
thread_local,
1358+
thread_local_macro,
1359+
todo_macro,
13341360
tool_attributes,
13351361
tool_lints,
13361362
trace_macros,
@@ -1381,6 +1407,7 @@ symbols! {
13811407
underscore_imports,
13821408
underscore_lifetimes,
13831409
uniform_paths,
1410+
unimplemented_macro,
13841411
unit,
13851412
universal_impl_trait,
13861413
unix,
@@ -1389,6 +1416,7 @@ symbols! {
13891416
unpin,
13901417
unreachable,
13911418
unreachable_code,
1419+
unreachable_macro,
13921420
unrestricted_attribute_tokens,
13931421
unsafe_block_in_unsafe_fn,
13941422
unsafe_cell,
@@ -1419,6 +1447,7 @@ symbols! {
14191447
var,
14201448
variant_count,
14211449
vec,
1450+
vec_macro,
14221451
version,
14231452
vis,
14241453
visible_private_types,
@@ -1443,7 +1472,9 @@ symbols! {
14431472
wrapping_sub,
14441473
wreg,
14451474
write_bytes,
1475+
write_macro,
14461476
write_str,
1477+
writeln_macro,
14471478
x87_reg,
14481479
xer,
14491480
xmm_reg,

‎library/alloc/src/macros.rs

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#[cfg(not(test))]
3838
#[macro_export]
3939
#[stable(feature = "rust1", since = "1.0.0")]
40+
#[rustc_diagnostic_item = "vec_macro"]
4041
#[allow_internal_unstable(box_syntax, liballoc_internals)]
4142
macro_rules! vec {
4243
() => (

‎library/core/src/macros/mod.rs

+24
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ macro_rules! panic {
3131
/// ```
3232
#[macro_export]
3333
#[stable(feature = "rust1", since = "1.0.0")]
34+
#[cfg_attr(not(test), rustc_diagnostic_item = "assert_eq_macro")]
3435
#[allow_internal_unstable(core_panic)]
3536
macro_rules! assert_eq {
3637
($left:expr, $right:expr $(,)?) => ({
@@ -80,6 +81,7 @@ macro_rules! assert_eq {
8081
/// ```
8182
#[macro_export]
8283
#[stable(feature = "assert_ne", since = "1.13.0")]
84+
#[cfg_attr(not(test), rustc_diagnostic_item = "assert_ne_macro")]
8385
#[allow_internal_unstable(core_panic)]
8486
macro_rules! assert_ne {
8587
($left:expr, $right:expr $(,)?) => ({
@@ -236,6 +238,7 @@ macro_rules! debug_assert {
236238
/// ```
237239
#[macro_export]
238240
#[stable(feature = "rust1", since = "1.0.0")]
241+
#[cfg_attr(not(test), rustc_diagnostic_item = "debug_assert_eq_macro")]
239242
macro_rules! debug_assert_eq {
240243
($($arg:tt)*) => (if $crate::cfg!(debug_assertions) { $crate::assert_eq!($($arg)*); })
241244
}
@@ -261,6 +264,7 @@ macro_rules! debug_assert_eq {
261264
/// ```
262265
#[macro_export]
263266
#[stable(feature = "assert_ne", since = "1.13.0")]
267+
#[cfg_attr(not(test), rustc_diagnostic_item = "debug_assert_ne_macro")]
264268
macro_rules! debug_assert_ne {
265269
($($arg:tt)*) => (if $crate::cfg!(debug_assertions) { $crate::assert_ne!($($arg)*); })
266270
}
@@ -320,6 +324,7 @@ pub macro debug_assert_matches($($arg:tt)*) {
320324
/// ```
321325
#[macro_export]
322326
#[stable(feature = "matches_macro", since = "1.42.0")]
327+
#[cfg_attr(not(test), rustc_diagnostic_item = "matches_macro")]
323328
macro_rules! matches {
324329
($expression:expr, $(|)? $( $pattern:pat_param )|+ $( if $guard: expr )? $(,)?) => {
325330
match $expression {
@@ -475,6 +480,7 @@ macro_rules! r#try {
475480
/// ```
476481
#[macro_export]
477482
#[stable(feature = "rust1", since = "1.0.0")]
483+
#[cfg_attr(not(test), rustc_diagnostic_item = "write_macro")]
478484
macro_rules! write {
479485
($dst:expr, $($arg:tt)*) => ($dst.write_fmt($crate::format_args!($($arg)*)))
480486
}
@@ -525,6 +531,7 @@ macro_rules! write {
525531
/// ```
526532
#[macro_export]
527533
#[stable(feature = "rust1", since = "1.0.0")]
534+
#[cfg_attr(not(test), rustc_diagnostic_item = "writeln_macro")]
528535
#[allow_internal_unstable(format_args_nl)]
529536
macro_rules! writeln {
530537
($dst:expr $(,)?) => (
@@ -589,6 +596,7 @@ macro_rules! writeln {
589596
/// ```
590597
#[macro_export]
591598
#[stable(feature = "rust1", since = "1.0.0")]
599+
#[cfg_attr(not(test), rustc_diagnostic_item = "unreachable_macro")]
592600
#[allow_internal_unstable(core_panic)]
593601
macro_rules! unreachable {
594602
() => ({
@@ -675,6 +683,7 @@ macro_rules! unreachable {
675683
/// ```
676684
#[macro_export]
677685
#[stable(feature = "rust1", since = "1.0.0")]
686+
#[cfg_attr(not(test), rustc_diagnostic_item = "unimplemented_macro")]
678687
#[allow_internal_unstable(core_panic)]
679688
macro_rules! unimplemented {
680689
() => ($crate::panicking::panic("not implemented"));
@@ -737,6 +746,7 @@ macro_rules! unimplemented {
737746
/// ```
738747
#[macro_export]
739748
#[stable(feature = "todo_macro", since = "1.40.0")]
749+
#[cfg_attr(not(test), rustc_diagnostic_item = "todo_macro")]
740750
#[allow_internal_unstable(core_panic)]
741751
macro_rules! todo {
742752
() => ($crate::panicking::panic("not yet implemented"));
@@ -786,6 +796,7 @@ pub(crate) mod builtin {
786796
#[stable(feature = "compile_error_macro", since = "1.20.0")]
787797
#[rustc_builtin_macro]
788798
#[macro_export]
799+
#[cfg_attr(not(test), rustc_diagnostic_item = "compile_error_macro")]
789800
macro_rules! compile_error {
790801
($msg:expr $(,)?) => {{ /* compiler built-in */ }};
791802
}
@@ -835,6 +846,7 @@ pub(crate) mod builtin {
835846
/// assert_eq!(s, format!("hello {}", "world"));
836847
/// ```
837848
#[stable(feature = "rust1", since = "1.0.0")]
849+
#[cfg_attr(not(test), rustc_diagnostic_item = "format_args_macro")]
838850
#[allow_internal_unsafe]
839851
#[allow_internal_unstable(fmt_internals)]
840852
#[rustc_builtin_macro]
@@ -905,6 +917,7 @@ pub(crate) mod builtin {
905917
#[stable(feature = "rust1", since = "1.0.0")]
906918
#[rustc_builtin_macro]
907919
#[macro_export]
920+
#[cfg_attr(not(test), rustc_diagnostic_item = "env_macro")]
908921
macro_rules! env {
909922
($name:expr $(,)?) => {{ /* compiler built-in */ }};
910923
($name:expr, $error_msg:expr $(,)?) => {{ /* compiler built-in */ }};
@@ -930,6 +943,7 @@ pub(crate) mod builtin {
930943
#[stable(feature = "rust1", since = "1.0.0")]
931944
#[rustc_builtin_macro]
932945
#[macro_export]
946+
#[cfg_attr(not(test), rustc_diagnostic_item = "option_env_macro")]
933947
macro_rules! option_env {
934948
($name:expr $(,)?) => {{ /* compiler built-in */ }};
935949
}
@@ -1015,6 +1029,7 @@ pub(crate) mod builtin {
10151029
#[stable(feature = "rust1", since = "1.0.0")]
10161030
#[rustc_builtin_macro]
10171031
#[macro_export]
1032+
#[cfg_attr(not(test), rustc_diagnostic_item = "concat_macro")]
10181033
macro_rules! concat {
10191034
($($e:expr),* $(,)?) => {{ /* compiler built-in */ }};
10201035
}
@@ -1040,6 +1055,7 @@ pub(crate) mod builtin {
10401055
#[stable(feature = "rust1", since = "1.0.0")]
10411056
#[rustc_builtin_macro]
10421057
#[macro_export]
1058+
#[cfg_attr(not(test), rustc_diagnostic_item = "line_macro")]
10431059
macro_rules! line {
10441060
() => {
10451061
/* compiler built-in */
@@ -1079,6 +1095,7 @@ pub(crate) mod builtin {
10791095
#[stable(feature = "rust1", since = "1.0.0")]
10801096
#[rustc_builtin_macro]
10811097
#[macro_export]
1098+
#[cfg_attr(not(test), rustc_diagnostic_item = "column_macro")]
10821099
macro_rules! column {
10831100
() => {
10841101
/* compiler built-in */
@@ -1104,6 +1121,7 @@ pub(crate) mod builtin {
11041121
#[stable(feature = "rust1", since = "1.0.0")]
11051122
#[rustc_builtin_macro]
11061123
#[macro_export]
1124+
#[cfg_attr(not(test), rustc_diagnostic_item = "file_macro")]
11071125
macro_rules! file {
11081126
() => {
11091127
/* compiler built-in */
@@ -1128,6 +1146,7 @@ pub(crate) mod builtin {
11281146
#[stable(feature = "rust1", since = "1.0.0")]
11291147
#[rustc_builtin_macro]
11301148
#[macro_export]
1149+
#[cfg_attr(not(test), rustc_diagnostic_item = "stringify_macro")]
11311150
macro_rules! stringify {
11321151
($($t:tt)*) => {
11331152
/* compiler built-in */
@@ -1169,6 +1188,7 @@ pub(crate) mod builtin {
11691188
#[stable(feature = "rust1", since = "1.0.0")]
11701189
#[rustc_builtin_macro]
11711190
#[macro_export]
1191+
#[cfg_attr(not(test), rustc_diagnostic_item = "include_str_macro")]
11721192
macro_rules! include_str {
11731193
($file:expr $(,)?) => {{ /* compiler built-in */ }};
11741194
}
@@ -1208,6 +1228,7 @@ pub(crate) mod builtin {
12081228
#[stable(feature = "rust1", since = "1.0.0")]
12091229
#[rustc_builtin_macro]
12101230
#[macro_export]
1231+
#[cfg_attr(not(test), rustc_diagnostic_item = "include_bytes_macro")]
12111232
macro_rules! include_bytes {
12121233
($file:expr $(,)?) => {{ /* compiler built-in */ }};
12131234
}
@@ -1232,6 +1253,7 @@ pub(crate) mod builtin {
12321253
#[stable(feature = "rust1", since = "1.0.0")]
12331254
#[rustc_builtin_macro]
12341255
#[macro_export]
1256+
#[cfg_attr(not(test), rustc_diagnostic_item = "module_path_macro")]
12351257
macro_rules! module_path {
12361258
() => {
12371259
/* compiler built-in */
@@ -1265,6 +1287,7 @@ pub(crate) mod builtin {
12651287
#[stable(feature = "rust1", since = "1.0.0")]
12661288
#[rustc_builtin_macro]
12671289
#[macro_export]
1290+
#[cfg_attr(not(test), rustc_diagnostic_item = "cfg_macro")]
12681291
macro_rules! cfg {
12691292
($($cfg:tt)*) => {
12701293
/* compiler built-in */
@@ -1315,6 +1338,7 @@ pub(crate) mod builtin {
13151338
#[stable(feature = "rust1", since = "1.0.0")]
13161339
#[rustc_builtin_macro]
13171340
#[macro_export]
1341+
#[cfg_attr(not(test), rustc_diagnostic_item = "include_macro")]
13181342
macro_rules! include {
13191343
($file:expr $(,)?) => {{ /* compiler built-in */ }};
13201344
}

0 commit comments

Comments
 (0)