Skip to content

Commit d6eff5a

Browse files
authored
Rollup merge of #89878 - GuillaumeGomez:add-missing-cfg-hide, r=notriddle
Fix missing remaining compiler specific cfg information Follow-up of #89596. We forgot a few of them: ![Screenshot from 2021-10-14 11-36-44](https://user-images.githubusercontent.com/3050060/137292700-64ebc59f-d9d2-41f2-be3a-fa5bf211523c.png) ![Screenshot from 2021-10-14 11-36-56](https://user-images.githubusercontent.com/3050060/137292703-f63fa4e5-2c56-446b-9f86-3652f03dfe59.png) r? `@notriddle`
2 parents 686857f + 30a20f8 commit d6eff5a

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

library/alloc/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
not(any(test, bootstrap)),
7575
any(not(feature = "miri-test-libstd"), test, doctest),
7676
no_global_oom_handling,
77+
not(no_global_oom_handling),
7778
target_has_atomic = "ptr"
7879
))
7980
)]

library/std/src/lib.rs

+9-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,15 @@
195195
test(no_crate_inject, attr(deny(warnings))),
196196
test(attr(allow(dead_code, deprecated, unused_variables, unused_mut)))
197197
)]
198-
#![cfg_attr(not(bootstrap), doc(cfg_hide(not(test), not(any(test, bootstrap)))))]
198+
#![cfg_attr(
199+
not(bootstrap),
200+
doc(cfg_hide(
201+
not(test),
202+
not(any(test, bootstrap)),
203+
no_global_oom_handling,
204+
not(no_global_oom_handling)
205+
))
206+
)]
199207
// Don't link to std. We are std.
200208
#![no_std]
201209
#![warn(deprecated_in_future)]

0 commit comments

Comments
 (0)