Skip to content

Fix no-panic link failure for non-constant u32/u64/u128 #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
patrick-immometrica wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix no-panic link failure for non-constant u32/u64/u128 #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ macro_rules! impl_Integer {
);
if self < 0 {
offset -= 1;
buf[offset].write(b'-');
unsafe { buf.get_unchecked_mut(offset).write(b'-') };
}
// SAFETY: Starting from `offset`, all elements of the slice have been set.
unsafe { slice_buffer_to_str(buf, offset) }
Expand Down Expand Up @@ -284,13 +284,13 @@ macro_rules! impl_Unsigned {
remain /= scale;
let (pair1, pair2) = divmod100(quad as u32);
unsafe {
buf[offset + 0]
buf.get_unchecked_mut(offset + 0)
.write(*DECIMAL_PAIRS.0.get_unchecked(pair1 as usize * 2 + 0));
buf[offset + 1]
buf.get_unchecked_mut(offset + 1)
.write(*DECIMAL_PAIRS.0.get_unchecked(pair1 as usize * 2 + 1));
buf[offset + 2]
buf.get_unchecked_mut(offset + 2)
.write(*DECIMAL_PAIRS.0.get_unchecked(pair2 as usize * 2 + 0));
buf[offset + 3]
buf.get_unchecked_mut(offset + 3)
.write(*DECIMAL_PAIRS.0.get_unchecked(pair2 as usize * 2 + 1));
}
}
Expand All @@ -302,9 +302,9 @@ macro_rules! impl_Unsigned {
let (last, pair) = divmod100(remain as u32);
remain = last as Self;
unsafe {
buf[offset + 0]
buf.get_unchecked_mut(offset + 0)
.write(*DECIMAL_PAIRS.0.get_unchecked(pair as usize * 2 + 0));
buf[offset + 1]
buf.get_unchecked_mut(offset + 1)
.write(*DECIMAL_PAIRS.0.get_unchecked(pair as usize * 2 + 1));
}
}
Expand All @@ -316,7 +316,7 @@ macro_rules! impl_Unsigned {
// Either the compiler sees that remain < 10, or it prevents
// a boundary check up next.
let last = remain as u8 & 15;
buf[offset].write(b'0' + last);
unsafe { buf.get_unchecked_mut(offset).write(b'0' + last) };
// not used: remain = 0;
}

Expand Down Expand Up @@ -370,10 +370,14 @@ impl Unsigned for u128 {
remain /= 1_00_00;
let (pair1, pair2) = divmod100(quad as u32);
unsafe {
buf[offset + 0].write(*DECIMAL_PAIRS.0.get_unchecked(pair1 as usize * 2 + 0));
buf[offset + 1].write(*DECIMAL_PAIRS.0.get_unchecked(pair1 as usize * 2 + 1));
buf[offset + 2].write(*DECIMAL_PAIRS.0.get_unchecked(pair2 as usize * 2 + 0));
buf[offset + 3].write(*DECIMAL_PAIRS.0.get_unchecked(pair2 as usize * 2 + 1));
buf.get_unchecked_mut(offset + 0)
.write(*DECIMAL_PAIRS.0.get_unchecked(pair1 as usize * 2 + 0));
buf.get_unchecked_mut(offset + 1)
.write(*DECIMAL_PAIRS.0.get_unchecked(pair1 as usize * 2 + 1));
buf.get_unchecked_mut(offset + 2)
.write(*DECIMAL_PAIRS.0.get_unchecked(pair2 as usize * 2 + 0));
buf.get_unchecked_mut(offset + 3)
.write(*DECIMAL_PAIRS.0.get_unchecked(pair2 as usize * 2 + 1));
}
}

Expand All @@ -384,8 +388,10 @@ impl Unsigned for u128 {
let (last, pair) = divmod100(remain as u32);
remain = last as u64;
unsafe {
buf[offset + 0].write(*DECIMAL_PAIRS.0.get_unchecked(pair as usize * 2 + 0));
buf[offset + 1].write(*DECIMAL_PAIRS.0.get_unchecked(pair as usize * 2 + 1));
buf.get_unchecked_mut(offset + 0)
.write(*DECIMAL_PAIRS.0.get_unchecked(pair as usize * 2 + 0));
buf.get_unchecked_mut(offset + 1)
.write(*DECIMAL_PAIRS.0.get_unchecked(pair as usize * 2 + 1));
}
}

Expand All @@ -396,7 +402,7 @@ impl Unsigned for u128 {
// Either the compiler sees that remain < 10, or it prevents
// a boundary check up next.
let last = remain as u8 & 15;
buf[offset].write(b'0' + last);
unsafe { buf.get_unchecked_mut(offset).write(b'0' + last) };
// not used: remain = 0;
}
offset
Expand Down
4 changes: 3 additions & 1 deletion tests/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
#![allow(non_snake_case)]

use std::hint;

macro_rules! test {
($($name:ident($value:expr, $expected:expr))*) => {
$(
#[test]
fn $name() {
let mut buffer = itoa::Buffer::new();
let s = buffer.format($value);
let s = buffer.format(hint::black_box($value));
assert_eq!(s, $expected);
}
)*
Expand Down
Loading