Skip to content

Commit 1c35968

Browse files
Rollup merge of rust-lang#89668 - Urgau:core-cfg-hide, r=GuillaumeGomez
Cfg hide more conditions for core and alloc Fixes rust-lang#89663 Before: ![image](https://user-images.githubusercontent.com/3616612/136572816-a7844ac7-dc2f-4d79-87b4-7f9766421a83.png) After: ![image](https://user-images.githubusercontent.com/3616612/136572745-7d890726-8efd-4d74-83ac-ed06f4687741.png) *Same for alloc* r? ``@GuillaumeGomez``
2 parents 836597a + 0a03ec4 commit 1c35968

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

library/alloc/src/lib.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,12 @@
6969
)]
7070
#![cfg_attr(
7171
not(bootstrap),
72-
doc(cfg_hide(not(test), not(any(test, bootstrap)), target_has_atomic = "ptr"))
72+
doc(cfg_hide(
73+
not(test),
74+
not(any(test, bootstrap)),
75+
any(not(feature = "miri-test-libstd"), test, doctest),
76+
target_has_atomic = "ptr"
77+
))
7378
)]
7479
#![no_std]
7580
#![needs_allocator]

library/core/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
not(bootstrap),
6565
doc(cfg_hide(
6666
not(test),
67+
any(not(feature = "miri-test-libstd"), test, doctest),
6768
target_pointer_width = "16",
6869
target_pointer_width = "32",
6970
target_pointer_width = "64",

0 commit comments

Comments
 (0)