Skip to content

Commit 12c4bca

Browse files
committed
Auto merge of rust-lang#115979 - GuillaumeGomez:rollup-06ujzgh, r=GuillaumeGomez
Rollup of 6 pull requests Successful merges: - rust-lang#113383 (style-guide: Add section on bugs, and resolving bugs) - rust-lang#115499 (rustc_target/riscv: Fix passing of transparent unions with only one non-ZST member) - rust-lang#115801 (Detect cycle errors hidden by opaques during monomorphization) - rust-lang#115947 (Custom code classes in docs warning) - rust-lang#115957 (fix mismatched symbols) - rust-lang#115958 (explain mysterious addition in float minimum/maximum) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 4285885 + 358320b commit 12c4bca

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

core/src/num/f32.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -957,6 +957,7 @@ impl f32 {
957957
} else if self == other {
958958
if self.is_sign_negative() && other.is_sign_positive() { self } else { other }
959959
} else {
960+
// At least one input is NaN. Use `+` to perform NaN propagation and quieting.
960961
self + other
961962
}
962963
}

core/src/num/f64.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -968,6 +968,7 @@ impl f64 {
968968
} else if self == other {
969969
if self.is_sign_negative() && other.is_sign_positive() { self } else { other }
970970
} else {
971+
// At least one input is NaN. Use `+` to perform NaN propagation and quieting.
971972
self + other
972973
}
973974
}

0 commit comments

Comments
 (0)