diff options
| author | bors <bors@rust-lang.org> | 2019-09-14 02:19:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-09-14 02:19:28 +0000 |
| commit | fdd48565d0c8a9e6fedd8c6db951ee46577b5f54 (patch) | |
| tree | 5d5b9d1cae0f42ae984aa492c94d820461e88145 /src/libcore | |
| parent | d097af105526a8defe413c64d79766333bb2085b (diff) | |
| parent | e0862784a1550dc1e07249c8967179a09b091141 (diff) | |
Auto merge of #64438 - cuviper:beta-rollup, r=Mark-Simulacrum
[beta] Rollup backports Cherry-picked: - Permit unwinding through FFI by default #62603 - pprust: Do not print spaces before some tokens #63897 - Account for doc comments coming from proc macros without spans #63930 - Support "soft" feature-gating using a lint #64066 - Update xLTO compatibility table in rustc book. #64092 - Include compiler-rt in the source tarball #64240 - Update LLVM submodule #64317 r? @Mark-Simulacrum
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/macros.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libcore/macros.rs b/src/libcore/macros.rs index f9dc53874ac..680fcd12c4f 100644 --- a/src/libcore/macros.rs +++ b/src/libcore/macros.rs @@ -1281,8 +1281,10 @@ pub(crate) mod builtin { pub macro test($item:item) { /* compiler built-in */ } /// Attribute macro applied to a function to turn it into a benchmark test. - #[unstable(feature = "test", issue = "50297", - reason = "`bench` is a part of custom test frameworks which are unstable")] + #[cfg_attr(not(boostrap_stdarch_ignore_this), unstable(soft, feature = "test", issue = "50297", + reason = "`bench` is a part of custom test frameworks which are unstable"))] + #[cfg_attr(boostrap_stdarch_ignore_this, unstable(feature = "test", issue = "50297", + reason = "`bench` is a part of custom test frameworks which are unstable"))] #[allow_internal_unstable(test, rustc_attrs)] #[rustc_builtin_macro] #[rustc_macro_transparency = "semitransparent"] |