From 78ef45f901c49ebf79a25d9cc14decfceccfc460 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Sat, 4 Aug 2018 21:40:48 -0700 Subject: [PATCH] Format with rustfmt 0.9.0 --- src/d2s.rs | 16 ++++++++++++---- src/d2s_small_table.rs | 7 +++++-- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/d2s.rs b/src/d2s.rs index d48eeee..d62a23a 100644 --- a/src/d2s.rs +++ b/src/d2s.rs @@ -225,9 +225,13 @@ pub fn d2d(ieee_mantissa: u64, ieee_exponent: u32) -> FloatingDecimal64 { vr = mul_shift_all( m2, #[cfg(feature = "small")] - unsafe { &compute_inv_pow5(q) }, + unsafe { + &compute_inv_pow5(q) + }, #[cfg(not(feature = "small"))] - unsafe { DOUBLE_POW5_INV_SPLIT.get_unchecked(q as usize) }, + unsafe { + DOUBLE_POW5_INV_SPLIT.get_unchecked(q as usize) + }, i as u32, &mut vp, &mut vm, @@ -257,9 +261,13 @@ pub fn d2d(ieee_mantissa: u64, ieee_exponent: u32) -> FloatingDecimal64 { vr = mul_shift_all( m2, #[cfg(feature = "small")] - unsafe { &compute_pow5(i as u32) }, + unsafe { + &compute_pow5(i as u32) + }, #[cfg(not(feature = "small"))] - unsafe { DOUBLE_POW5_SPLIT.get_unchecked(i as usize) }, + unsafe { + DOUBLE_POW5_SPLIT.get_unchecked(i as usize) + }, j as u32, &mut vp, &mut vm, diff --git a/src/d2s_small_table.rs b/src/d2s_small_table.rs index 3d13bc7..c6e3f65 100644 --- a/src/d2s_small_table.rs +++ b/src/d2s_small_table.rs @@ -168,7 +168,8 @@ pub unsafe fn compute_pow5(i: u32) -> (u64, u64) { let delta = pow5bits(i as i32) - pow5bits(base2 as i32); debug_assert!(base < POW5_OFFSETS.len() as u32); ( - shiftright128(low0, sum, delta) + ((*POW5_OFFSETS.get_unchecked(base as usize) >> offset) & 1) as u64, + shiftright128(low0, sum, delta) + + ((*POW5_OFFSETS.get_unchecked(base as usize) >> offset) & 1) as u64, shiftright128(sum, high1, delta), ) } @@ -197,7 +198,9 @@ pub unsafe fn compute_inv_pow5(i: u32) -> (u64, u64) { let delta = pow5bits(base2 as i32) - pow5bits(i as i32); debug_assert!(base < POW5_INV_OFFSETS.len() as u32); ( - shiftright128(low0, sum, delta) + 1 + ((*POW5_INV_OFFSETS.get_unchecked((i / 16) as usize) >> ((i % 16) << 1)) & 3) as u64, + shiftright128(low0, sum, delta) + + 1 + + ((*POW5_INV_OFFSETS.get_unchecked((i / 16) as usize) >> ((i % 16) << 1)) & 3) as u64, shiftright128(sum, high1, delta), ) }