move pal cfgs in f32 and f64 to sys

Author: devsnek

library/std/src/f32.rs

@@ -470,10 +470,7 @@ impl f32 {
     #[stable(feature = "rust1", since = "1.0.0")]
     #[inline]
     pub fn log2(self) -> f32 {
-        #[cfg(target_os = "android")]
-        return crate::sys::android::log2f32(self);
-        #[cfg(not(target_os = "android"))]
-        return unsafe { intrinsics::log2f32(self) };
+        return crate::sys::log2f32(self);
     }
 
     /// Returns the base 10 logarithm of the number.

library/std/src/f64.rs

@@ -470,12 +470,7 @@ impl f64 {
     #[stable(feature = "rust1", since = "1.0.0")]
     #[inline]
     pub fn log2(self) -> f64 {
-        self.log_wrapper(|n| {
-            #[cfg(target_os = "android")]
-            return crate::sys::android::log2f64(n);
-            #[cfg(not(target_os = "android"))]
-            return unsafe { intrinsics::log2f64(n) };
-        })
+        self.log_wrapper(crate::sys::log2f64)
     }
 
     /// Returns the base 10 logarithm of the number.
@@ -936,8 +931,8 @@ impl f64 {
     // of expected NaN).
     #[rustc_allow_incoherent_impl]
     fn log_wrapper<F: Fn(f64) -> f64>(self, log_fn: F) -> f64 {
-        if !cfg!(any(target_os = "solaris", target_os = "illumos")) {
-            log_fn(self)
+        if let Some(result) = crate::sys::log_wrapper(self) {
+            log_fn(result)
         } else if self.is_finite() {
             if self > 0.0 {
                 log_fn(self)

library/std/src/sys/mod.rs

@@ -76,3 +76,32 @@ cfg_if::cfg_if! {
         pub mod c;
     }
 }
+
+#[cfg(not(test))]
+cfg_if::cfg_if! {
+    if #[cfg(target_os = "android")] {
+        pub use crate::android::log2f32;
+        pub use crate::android::log2f64;
+    } else {
+        pub fn log2f32(n: f32) -> f32 {
+            unsafe { crate::intrinsics::log2f32(n) }
+        }
+
+        pub fn log2f64(n: f64) -> f64 {
+            unsafe { crate::intrinsics::log2f64(n) }
+        }
+    }
+}
+
+#[cfg(not(test))]
+cfg_if::cfg_if! {
+    if #[cfg(any(target_os = "solaris", target_os = "illumos"))] {
+        pub fn log_wrapper(n: f64) -> Option<f64> {
+            Some(n)
+        }
+    } else {
+        pub fn log_wrapper(_n: f64) -> Option<f64> {
+            None
+        }
+    }
+}

src/tools/tidy/src/pal.rs

@@ -54,8 +54,6 @@ const EXCEPTION_PATHS: &[&str] = &[
     // FIXME: platform-specific code should be moved to `sys`
     "library/std/src/io/copy.rs",
     "library/std/src/io/stdio.rs",
-    "library/std/src/f32.rs",
-    "library/std/src/f64.rs",
     "library/std/src/path.rs",
     "library/std/src/sys_common", // Should only contain abstractions over platforms
     "library/std/src/net/test.rs", // Utility helpers for tests