Rollup merge of #128416 - maurer:remove-android-hack, r=tgross35 · model-checking/verify-rust-std@32894e2 (original) (raw)
Navigation Menu
- Explore
- Pricing
Provide feedback
Saved searches
Use saved searches to filter your results more quickly
Commit 32894e2
Rollup merge of rust-lang#128416 - maurer:remove-android-hack, r=tgross35
android: Remove libstd hacks for unsupported Android APIs Our minimum supported API version is 21, remove hacks to support older Android APIs. try-job: arm-android r? tgross35
File tree
5 files changed
lines changed
5 files changed
lines changed
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -574,7 +574,7 @@ impl f32 { | ||
| 574 | 574 | #[stable(feature = "rust1", since = "1.0.0")] |
| 575 | 575 | #[inline] |
| 576 | 576 | pub fn log2(self) -> f32 { |
| 577 | -crate::sys::log2f32(self) | |
| 577 | +unsafe { intrinsics::log2f32(self) } | |
| 578 | 578 | } |
| 579 | 579 | |
| 580 | 580 | /// Returns the base 10 logarithm of the number. |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -574,7 +574,7 @@ impl f64 { | ||
| 574 | 574 | #[stable(feature = "rust1", since = "1.0.0")] |
| 575 | 575 | #[inline] |
| 576 | 576 | pub fn log2(self) -> f64 { |
| 577 | -crate::sys::log2f64(self) | |
| 577 | +unsafe { intrinsics::log2f64(self) } | |
| 578 | 578 | } |
| 579 | 579 | |
| 580 | 580 | /// Returns the base 10 logarithm of the number. |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -76,23 +76,5 @@ cfg_if::cfg_if! { | ||
| 76 | 76 | } |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | -#[cfg(not(test))] | |
| 80 | -cfg_if::cfg_if! { | |
| 81 | -if #[cfg(target_os = "android")] { | |
| 82 | -pub use self::android::log2f32; | |
| 83 | -pub use self::android::log2f64; | |
| 84 | -} else { | |
| 85 | - #[inline] | |
| 86 | -pub fn log2f32(n: f32) -> f32 { | |
| 87 | -unsafe { crate::intrinsics::log2f32(n) } | |
| 88 | -} | |
| 89 | - | |
| 90 | - #[inline] | |
| 91 | -pub fn log2f64(n: f64) -> f64 { | |
| 92 | -unsafe { crate::intrinsics::log2f64(n) } | |
| 93 | -} | |
| 94 | -} | |
| 95 | -} | |
| 96 | - | |
| 97 | 79 | #[cfg(not(target_os = "uefi"))] |
| 98 | 80 | pub type RawOsError = i32; |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -8,7 +8,6 @@ use crate::io::ErrorKind; | ||
| 8 | 8 | pub mod weak; |
| 9 | 9 | |
| 10 | 10 | pub mod alloc; |
| 11 | -pub mod android; | |
| 12 | 11 | pub mod args; |
| 13 | 12 | pub mod env; |
| 14 | 13 | pub mod fd; |
| @@ -237,12 +236,8 @@ pub unsafe fn cleanup() { | ||
| 237 | 236 | } |
| 238 | 237 | |
| 239 | 238 | #[allow(unused_imports)] |
| 240 | -#[cfg(not(target_os = "android"))] | |
| 241 | 239 | pub use libc::signal; |
| 242 | 240 | |
| 243 | -#[cfg(target_os = "android")] | |
| 244 | -pub use crate::sys::android::signal; | |
| 245 | - | |
| 246 | 241 | #[inline] |
| 247 | 242 | pub(crate) fn is_interrupted(errno: i32) -> bool { |
| 248 | 243 | errno == libc::EINTR |