diff options
| author | bors <bors@rust-lang.org> | 2021-07-14 18:36:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-07-14 18:36:44 +0000 |
| commit | e87188c252a3b6dea8ed54d7915fbc2cfb61443b (patch) | |
| tree | d1a7dcc583bbe747a2b06f9d31d45f13a65da0f3 /library/std/src | |
| parent | 4f0c568785adcc0a123cac9d47047020b7a24821 (diff) | |
| parent | ac6672b74631cfcdbfd042724e29969b193cefa1 (diff) | |
| download | rust-e87188c252a3b6dea8ed54d7915fbc2cfb61443b.tar.gz rust-e87188c252a3b6dea8ed54d7915fbc2cfb61443b.zip | |
Auto merge of #87133 - GuillaumeGomez:rollup-pfz9jbk, r=GuillaumeGomez
Rollup of 6 pull requests Successful merges: - #87027 (expand: Support helper attributes for built-in derive macros) - #87056 (Fix codeblocks overflow) - #87117 (Shrink the CrateStore dynamic interface.) - #87120 (rustdoc: Remove unnecessary `extern crate` aliases) - #87125 (Fix Ayu theme `<code>` color) - #87130 (Update browser-ui-test package version) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/macros.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/library/std/src/macros.rs b/library/std/src/macros.rs index b2c5df5410d..7afe52a3fd6 100644 --- a/library/std/src/macros.rs +++ b/library/std/src/macros.rs @@ -6,7 +6,8 @@ #[doc = include_str!("../../core/src/macros/panic.md")] #[macro_export] -#[rustc_builtin_macro = "std_panic"] +#[cfg_attr(bootstrap, rustc_builtin_macro = "std_panic")] +#[cfg_attr(not(bootstrap), rustc_builtin_macro(std_panic))] #[stable(feature = "rust1", since = "1.0.0")] #[allow_internal_unstable(edition_panic)] #[cfg_attr(not(test), rustc_diagnostic_item = "std_panic_macro")] |