Skip to content

Commit bf90b23

Browse files
committed
Auto merge of rust-lang#117608 - matthiaskrgr:rollup-g9fagmv, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - rust-lang#116017 (Don't pass `-stdlib=libc++` when building C files on macOS) - rust-lang#117524 (bootstrap/setup: create hooks directory if non-existing) - rust-lang#117588 (Remove unused LoadResult::DecodeIncrCache variant) - rust-lang#117596 (Add diagnostic items for a few of core's builtin macros) r? `@ghost` `@rustbot` modify labels: rollup
2 parents b072086 + 1b9bbfa commit bf90b23

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

core/src/macros/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1044,6 +1044,7 @@ pub(crate) mod builtin {
10441044
#[stable(feature = "rust1", since = "1.0.0")]
10451045
#[rustc_builtin_macro]
10461046
#[macro_export]
1047+
#[rustc_diagnostic_item = "env_macro"] // useful for external lints
10471048
macro_rules! env {
10481049
($name:expr $(,)?) => {{ /* compiler built-in */ }};
10491050
($name:expr, $error_msg:expr $(,)?) => {{ /* compiler built-in */ }};
@@ -1074,6 +1075,7 @@ pub(crate) mod builtin {
10741075
#[stable(feature = "rust1", since = "1.0.0")]
10751076
#[rustc_builtin_macro]
10761077
#[macro_export]
1078+
#[rustc_diagnostic_item = "option_env_macro"] // useful for external lints
10771079
macro_rules! option_env {
10781080
($name:expr $(,)?) => {{ /* compiler built-in */ }};
10791081
}
@@ -1479,6 +1481,7 @@ pub(crate) mod builtin {
14791481
#[stable(feature = "rust1", since = "1.0.0")]
14801482
#[rustc_builtin_macro]
14811483
#[macro_export]
1484+
#[rustc_diagnostic_item = "include_macro"] // useful for external lints
14821485
macro_rules! include {
14831486
($file:expr $(,)?) => {{ /* compiler built-in */ }};
14841487
}

0 commit comments

Comments
 (0)