From 602dd145a3f0bdb85793e3d9ab05e6e56b2e567f Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Sun, 23 Aug 2020 18:45:57 -0400 Subject: [PATCH 1/2] Use allow(unused_imports) instead of cfg(doc) This prevents links from breaking when items are re-exported in a different crate and the original isn't being documented. --- library/core/src/intrinsics.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/core/src/intrinsics.rs b/library/core/src/intrinsics.rs index 9acf43931c6ba..95edf463b8305 100644 --- a/library/core/src/intrinsics.rs +++ b/library/core/src/intrinsics.rs @@ -58,7 +58,7 @@ use crate::marker::DiscriminantKind; use crate::mem; // These imports are used for simplifying intra-doc links -#[cfg(doc)] +#[allow(unused_imports)] use crate::sync::atomic::{self, AtomicBool, AtomicI32, AtomicIsize, AtomicU32, Ordering}; #[stable(feature = "drop_in_place", since = "1.8.0")] From 5aac94a1f616f3fce070cb9b21995712aef6cc0d Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Sun, 23 Aug 2020 23:11:47 -0400 Subject: [PATCH 2/2] Don't import atomics unless supported by the platform --- library/core/src/intrinsics.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/library/core/src/intrinsics.rs b/library/core/src/intrinsics.rs index 95edf463b8305..25951e2f58235 100644 --- a/library/core/src/intrinsics.rs +++ b/library/core/src/intrinsics.rs @@ -59,6 +59,7 @@ use crate::mem; // These imports are used for simplifying intra-doc links #[allow(unused_imports)] +#[cfg(all(target_has_atomic = "8", target_has_atomic = "32", target_has_atomic = "ptr"))] use crate::sync::atomic::{self, AtomicBool, AtomicI32, AtomicIsize, AtomicU32, Ordering}; #[stable(feature = "drop_in_place", since = "1.8.0")]