Skip to content

Commit 95428e1

Browse files
committed
Merge ref 'f6092f224d2b' from rust-lang/rust
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: f6092f224d2b1774b31033f12d0bee626943b02f Filtered ref: f843cd4 This merge was created using https://github.com/rust-lang/josh-sync.
2 parents 5ca21df + f843cd4 commit 95428e1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

tests/pass/float.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1419,12 +1419,12 @@ fn test_fmuladd() {
14191419

14201420
#[inline(never)]
14211421
pub fn test_operations_f32(a: f32, b: f32, c: f32) {
1422-
assert_approx_eq!(unsafe { fmuladdf32(a, b, c) }, a * b + c);
1422+
assert_approx_eq!(fmuladdf32(a, b, c), a * b + c);
14231423
}
14241424

14251425
#[inline(never)]
14261426
pub fn test_operations_f64(a: f64, b: f64, c: f64) {
1427-
assert_approx_eq!(unsafe { fmuladdf64(a, b, c) }, a * b + c);
1427+
assert_approx_eq!(fmuladdf64(a, b, c), a * b + c);
14281428
}
14291429

14301430
test_operations_f32(0.1, 0.2, 0.3);

tests/pass/intrinsics/fmuladd_nondeterministic.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fn main() {
1414
let c = std::hint::black_box(-a * b);
1515
// It is unspecified whether the following operation is fused or not. The
1616
// following evaluates to 0.0 if unfused, and nonzero (-1.66e-18) if fused.
17-
let x = unsafe { fmuladdf64(a, b, c) };
17+
let x = fmuladdf64(a, b, c);
1818
x == 0.0
1919
});
2020

@@ -24,7 +24,7 @@ fn main() {
2424
let c = std::hint::black_box(-a * b);
2525
// It is unspecified whether the following operation is fused or not. The
2626
// following evaluates to 0.0 if unfused, and nonzero (-8.1956386e-10) if fused.
27-
let x = unsafe { fmuladdf32(a, b, c) };
27+
let x = fmuladdf32(a, b, c);
2828
x == 0.0
2929
});
3030

0 commit comments

Comments
 (0)