From 7d287d84f9ab6adf5dfcef9f6ed3d1d7aaed1786 Mon Sep 17 00:00:00 2001
From: The8472 <git@infinite-source.de>
Date: Sat, 13 Mar 2021 20:06:25 +0100
Subject: [PATCH] make is_{arch}_feature_detected! available for std

---
 crates/std_detect/src/detect/macros.rs |  3 +++
 crates/std_detect/src/detect/mod.rs    | 16 ++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/crates/std_detect/src/detect/macros.rs b/crates/std_detect/src/detect/macros.rs
index b9dbf9184e..1406367421 100644
--- a/crates/std_detect/src/detect/macros.rs
+++ b/crates/std_detect/src/detect/macros.rs
@@ -43,6 +43,9 @@ macro_rules! features {
             };
         }
 
+        #[cfg(not(test))]
+        pub use $macro_name;
+
         /// Each variant denotes a position in a bitset for a particular feature.
         ///
         /// PLEASE: do not use this, it is an implementation detail subject
diff --git a/crates/std_detect/src/detect/mod.rs b/crates/std_detect/src/detect/mod.rs
index 1b7768ae8f..bb2764f3de 100644
--- a/crates/std_detect/src/detect/mod.rs
+++ b/crates/std_detect/src/detect/mod.rs
@@ -29,35 +29,35 @@ cfg_if! {
     if #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] {
         #[path = "arch/x86.rs"]
         #[macro_use]
-        mod arch;
+        pub(crate) mod arch;
     } else if #[cfg(target_arch = "arm")] {
         #[path = "arch/arm.rs"]
         #[macro_use]
-        mod arch;
+        pub(crate) mod arch;
     } else if #[cfg(target_arch = "aarch64")] {
         #[path = "arch/aarch64.rs"]
         #[macro_use]
-        mod arch;
+        pub(crate) mod arch;
     } else if #[cfg(target_arch = "powerpc")] {
         #[path = "arch/powerpc.rs"]
         #[macro_use]
-        mod arch;
+        pub(crate) mod arch;
     } else if #[cfg(target_arch = "powerpc64")] {
         #[path = "arch/powerpc64.rs"]
         #[macro_use]
-        mod arch;
+        pub(crate) mod arch;
     } else if #[cfg(target_arch = "mips")] {
         #[path = "arch/mips.rs"]
         #[macro_use]
-        mod arch;
+        pub(crate) mod arch;
     } else if #[cfg(target_arch = "mips64")] {
         #[path = "arch/mips64.rs"]
         #[macro_use]
-        mod arch;
+        pub(crate) mod arch;
     } else {
         // Unimplemented architecture:
         #[allow(dead_code)]
-        mod arch {
+        pub(crate) mod arch {
             #[doc(hidden)]
             pub(crate) enum Feature {
                 Null