about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2021-10-14 16:06:47 +0200
committerGitHub <noreply@github.com>2021-10-14 16:06:47 +0200
commitd6eff5ac4c3dcb3eb5c83a1a2a6ea8437450f25b (patch)
tree4d15f44d4a804a57852f7152646c1fd50e357907
parent686857f5bf6f494bdaedd248956e96d48cf0a738 (diff)
parent30a20f8c83161b17be9d550b1d4fd458c05117a3 (diff)
downloadrust-d6eff5ac4c3dcb3eb5c83a1a2a6ea8437450f25b.tar.gz
rust-d6eff5ac4c3dcb3eb5c83a1a2a6ea8437450f25b.zip
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`
-rw-r--r--library/alloc/src/lib.rs1
-rw-r--r--library/std/src/lib.rs10
2 files changed, 10 insertions, 1 deletions
diff --git a/library/alloc/src/lib.rs b/library/alloc/src/lib.rs
index 89ab11fb97e..e86c41b1ff8 100644
--- a/library/alloc/src/lib.rs
+++ b/library/alloc/src/lib.rs
@@ -74,6 +74,7 @@
         not(any(test, bootstrap)),
         any(not(feature = "miri-test-libstd"), test, doctest),
         no_global_oom_handling,
+        not(no_global_oom_handling),
         target_has_atomic = "ptr"
     ))
 )]
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs
index b16436a18f0..1d2d26b8f00 100644
--- a/library/std/src/lib.rs
+++ b/library/std/src/lib.rs
@@ -195,7 +195,15 @@
     test(no_crate_inject, attr(deny(warnings))),
     test(attr(allow(dead_code, deprecated, unused_variables, unused_mut)))
 )]
-#![cfg_attr(not(bootstrap), doc(cfg_hide(not(test), not(any(test, bootstrap)))))]
+#![cfg_attr(
+    not(bootstrap),
+    doc(cfg_hide(
+        not(test),
+        not(any(test, bootstrap)),
+        no_global_oom_handling,
+        not(no_global_oom_handling)
+    ))
+)]
 // Don't link to std. We are std.
 #![no_std]
 #![warn(deprecated_in_future)]