diff options
| author | bors <bors@rust-lang.org> | 2023-11-05 11:47:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-11-05 11:47:38 +0000 |
| commit | 04817ff00cfa1ec00a9babcb2ade1e3f2874d9bd (patch) | |
| tree | 0b6bfd85de61c1dd13923e235636a37757653b8e /library/core | |
| parent | 513a48517ed80cb979d88e7eb7fbcf761a35620b (diff) | |
| parent | a6605163346d7680502d8e2c1e5aaf1dc3229e41 (diff) | |
| download | rust-04817ff00cfa1ec00a9babcb2ade1e3f2874d9bd.tar.gz rust-04817ff00cfa1ec00a9babcb2ade1e3f2874d9bd.zip | |
Auto merge of #117608 - matthiaskrgr:rollup-g9fagmv, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - #116017 (Don't pass `-stdlib=libc++` when building C files on macOS) - #117524 (bootstrap/setup: create hooks directory if non-existing) - #117588 (Remove unused LoadResult::DecodeIncrCache variant) - #117596 (Add diagnostic items for a few of core's builtin macros) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/core')
| -rw-r--r-- | library/core/src/macros/mod.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/library/core/src/macros/mod.rs b/library/core/src/macros/mod.rs index 125a6f57bfb..7f5908e477c 100644 --- a/library/core/src/macros/mod.rs +++ b/library/core/src/macros/mod.rs @@ -1044,6 +1044,7 @@ pub(crate) mod builtin { #[stable(feature = "rust1", since = "1.0.0")] #[rustc_builtin_macro] #[macro_export] + #[rustc_diagnostic_item = "env_macro"] // useful for external lints macro_rules! env { ($name:expr $(,)?) => {{ /* compiler built-in */ }}; ($name:expr, $error_msg:expr $(,)?) => {{ /* compiler built-in */ }}; @@ -1074,6 +1075,7 @@ pub(crate) mod builtin { #[stable(feature = "rust1", since = "1.0.0")] #[rustc_builtin_macro] #[macro_export] + #[rustc_diagnostic_item = "option_env_macro"] // useful for external lints macro_rules! option_env { ($name:expr $(,)?) => {{ /* compiler built-in */ }}; } @@ -1479,6 +1481,7 @@ pub(crate) mod builtin { #[stable(feature = "rust1", since = "1.0.0")] #[rustc_builtin_macro] #[macro_export] + #[rustc_diagnostic_item = "include_macro"] // useful for external lints macro_rules! include { ($file:expr $(,)?) => {{ /* compiler built-in */ }}; } |