1
Fork 0

Rollup merge of #77921 - wcampbell0x2a:f64-collapsible-if, r=jyn514

f64: Refactor collapsible_if
This commit is contained in:
Yuki Okushi 2020-10-30 18:00:49 +09:00 committed by GitHub
commit 02a4b58a3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -920,8 +920,7 @@ impl f64 {
fn log_wrapper<F: Fn(f64) -> f64>(self, log_fn: F) -> f64 { fn log_wrapper<F: Fn(f64) -> f64>(self, log_fn: F) -> f64 {
if !cfg!(any(target_os = "solaris", target_os = "illumos")) { if !cfg!(any(target_os = "solaris", target_os = "illumos")) {
log_fn(self) log_fn(self)
} else { } else if self.is_finite() {
if self.is_finite() {
if self > 0.0 { if self > 0.0 {
log_fn(self) log_fn(self)
} else if self == 0.0 { } else if self == 0.0 {
@ -937,5 +936,4 @@ impl f64 {
Self::NAN // log(-Inf) = NaN Self::NAN // log(-Inf) = NaN
} }
} }
}
} }