Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
e6cbf0b921
|
@ -102,6 +102,7 @@ jobs:
|
||||||
timeout-minutes: 45
|
timeout-minutes: 45
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
- uses: dtolnay/rust-toolchain@stable
|
||||||
- uses: dtolnay/install@cargo-outdated
|
- uses: dtolnay/install@cargo-outdated
|
||||||
- run: cargo outdated --workspace --exit-code 1
|
- run: cargo outdated --workspace --exit-code 1
|
||||||
- run: cargo outdated --manifest-path fuzz/Cargo.toml --exit-code 1
|
- run: cargo outdated --manifest-path fuzz/Cargo.toml --exit-code 1
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "itoa"
|
name = "itoa"
|
||||||
version = "1.0.10"
|
version = "1.0.11"
|
||||||
authors = ["David Tolnay <dtolnay@gmail.com>"]
|
authors = ["David Tolnay <dtolnay@gmail.com>"]
|
||||||
categories = ["value-formatting", "no-std", "no-std::no-alloc"]
|
categories = ["value-formatting", "no-std", "no-std::no-alloc"]
|
||||||
description = "Fast integer primitive to string conversion"
|
description = "Fast integer primitive to string conversion"
|
||||||
|
|
54
src/lib.rs
54
src/lib.rs
|
@ -30,11 +30,13 @@
|
||||||
//!
|
//!
|
||||||
//! ![performance](https://raw.githubusercontent.com/dtolnay/itoa/master/performance.png)
|
//! ![performance](https://raw.githubusercontent.com/dtolnay/itoa/master/performance.png)
|
||||||
|
|
||||||
#![doc(html_root_url = "https://docs.rs/itoa/1.0.10")]
|
#![doc(html_root_url = "https://docs.rs/itoa/1.0.11")]
|
||||||
#![no_std]
|
#![no_std]
|
||||||
#![allow(
|
#![allow(
|
||||||
clippy::cast_lossless,
|
clippy::cast_lossless,
|
||||||
clippy::cast_possible_truncation,
|
clippy::cast_possible_truncation,
|
||||||
|
clippy::cast_possible_wrap,
|
||||||
|
clippy::cast_sign_loss,
|
||||||
clippy::expl_impl_clone_on_copy,
|
clippy::expl_impl_clone_on_copy,
|
||||||
clippy::must_use_candidate,
|
clippy::must_use_candidate,
|
||||||
clippy::needless_doctest_main,
|
clippy::needless_doctest_main,
|
||||||
|
@ -145,17 +147,16 @@ macro_rules! impl_Integer {
|
||||||
let mut n = if is_nonnegative {
|
let mut n = if is_nonnegative {
|
||||||
self as $conv_fn
|
self as $conv_fn
|
||||||
} else {
|
} else {
|
||||||
// convert the negative num to positive by summing 1 to it's 2 complement
|
// Convert negative number to positive by summing 1 to its two's complement.
|
||||||
(!(self as $conv_fn)).wrapping_add(1)
|
(!(self as $conv_fn)).wrapping_add(1)
|
||||||
};
|
};
|
||||||
let mut curr = buf.len() as isize;
|
let mut curr = buf.len() as isize;
|
||||||
let buf_ptr = buf.as_mut_ptr() as *mut u8;
|
let buf_ptr = buf.as_mut_ptr() as *mut u8;
|
||||||
let lut_ptr = DEC_DIGITS_LUT.as_ptr();
|
let lut_ptr = DEC_DIGITS_LUT.as_ptr();
|
||||||
|
|
||||||
unsafe {
|
// Need at least 16 bits for the 4-digits-at-a-time to work.
|
||||||
// need at least 16 bits for the 4-characters-at-a-time to work.
|
|
||||||
if mem::size_of::<$t>() >= 2 {
|
if mem::size_of::<$t>() >= 2 {
|
||||||
// eagerly decode 4 characters at a time
|
// Eagerly decode 4 digits at a time.
|
||||||
while n >= 10000 {
|
while n >= 10000 {
|
||||||
let rem = (n % 10000) as isize;
|
let rem = (n % 10000) as isize;
|
||||||
n /= 10000;
|
n /= 10000;
|
||||||
|
@ -163,34 +164,43 @@ macro_rules! impl_Integer {
|
||||||
let d1 = (rem / 100) << 1;
|
let d1 = (rem / 100) << 1;
|
||||||
let d2 = (rem % 100) << 1;
|
let d2 = (rem % 100) << 1;
|
||||||
curr -= 4;
|
curr -= 4;
|
||||||
|
unsafe {
|
||||||
ptr::copy_nonoverlapping(lut_ptr.offset(d1), buf_ptr.offset(curr), 2);
|
ptr::copy_nonoverlapping(lut_ptr.offset(d1), buf_ptr.offset(curr), 2);
|
||||||
ptr::copy_nonoverlapping(lut_ptr.offset(d2), buf_ptr.offset(curr + 2), 2);
|
ptr::copy_nonoverlapping(lut_ptr.offset(d2), buf_ptr.offset(curr + 2), 2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// if we reach here numbers are <= 9999, so at most 4 chars long
|
// If we reach here, numbers are <=9999 so at most 4 digits long.
|
||||||
let mut n = n as isize; // possibly reduce 64bit math
|
let mut n = n as isize; // Possibly reduce 64-bit math.
|
||||||
|
|
||||||
// decode 2 more chars, if > 2 chars
|
// Decode 2 more digits, if >2 digits.
|
||||||
if n >= 100 {
|
if n >= 100 {
|
||||||
let d1 = (n % 100) << 1;
|
let d1 = (n % 100) << 1;
|
||||||
n /= 100;
|
n /= 100;
|
||||||
curr -= 2;
|
curr -= 2;
|
||||||
|
unsafe {
|
||||||
ptr::copy_nonoverlapping(lut_ptr.offset(d1), buf_ptr.offset(curr), 2);
|
ptr::copy_nonoverlapping(lut_ptr.offset(d1), buf_ptr.offset(curr), 2);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// decode last 1 or 2 chars
|
// Decode last 1 or 2 digits.
|
||||||
if n < 10 {
|
if n < 10 {
|
||||||
curr -= 1;
|
curr -= 1;
|
||||||
|
unsafe {
|
||||||
*buf_ptr.offset(curr) = (n as u8) + b'0';
|
*buf_ptr.offset(curr) = (n as u8) + b'0';
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
let d1 = n << 1;
|
let d1 = n << 1;
|
||||||
curr -= 2;
|
curr -= 2;
|
||||||
|
unsafe {
|
||||||
ptr::copy_nonoverlapping(lut_ptr.offset(d1), buf_ptr.offset(curr), 2);
|
ptr::copy_nonoverlapping(lut_ptr.offset(d1), buf_ptr.offset(curr), 2);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if !is_nonnegative {
|
if !is_nonnegative {
|
||||||
curr -= 1;
|
curr -= 1;
|
||||||
|
unsafe {
|
||||||
*buf_ptr.offset(curr) = b'-';
|
*buf_ptr.offset(curr) = b'-';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -247,51 +257,57 @@ macro_rules! impl_Integer128 {
|
||||||
let n = if is_nonnegative {
|
let n = if is_nonnegative {
|
||||||
self as u128
|
self as u128
|
||||||
} else {
|
} else {
|
||||||
// convert the negative num to positive by summing 1 to it's 2 complement
|
// Convert negative number to positive by summing 1 to its two's complement.
|
||||||
(!(self as u128)).wrapping_add(1)
|
(!(self as u128)).wrapping_add(1)
|
||||||
};
|
};
|
||||||
let mut curr = buf.len() as isize;
|
let mut curr = buf.len() as isize;
|
||||||
let buf_ptr = buf.as_mut_ptr() as *mut u8;
|
let buf_ptr = buf.as_mut_ptr() as *mut u8;
|
||||||
|
|
||||||
unsafe {
|
|
||||||
// Divide by 10^19 which is the highest power less than 2^64.
|
// Divide by 10^19 which is the highest power less than 2^64.
|
||||||
let (n, rem) = udiv128::udivmod_1e19(n);
|
let (n, rem) = udiv128::udivmod_1e19(n);
|
||||||
let buf1 = buf_ptr.offset(curr - U64_MAX_LEN as isize) as *mut [MaybeUninit<u8>; U64_MAX_LEN];
|
let buf1 = unsafe { buf_ptr.offset(curr - U64_MAX_LEN as isize) as *mut [MaybeUninit<u8>; U64_MAX_LEN] };
|
||||||
curr -= rem.write(&mut *buf1).len() as isize;
|
curr -= rem.write(unsafe { &mut *buf1 }).len() as isize;
|
||||||
|
|
||||||
if n != 0 {
|
if n != 0 {
|
||||||
// Memset the base10 leading zeros of rem.
|
// Memset the base10 leading zeros of rem.
|
||||||
let target = buf.len() as isize - 19;
|
let target = buf.len() as isize - 19;
|
||||||
|
unsafe {
|
||||||
ptr::write_bytes(buf_ptr.offset(target), b'0', (curr - target) as usize);
|
ptr::write_bytes(buf_ptr.offset(target), b'0', (curr - target) as usize);
|
||||||
|
}
|
||||||
curr = target;
|
curr = target;
|
||||||
|
|
||||||
// Divide by 10^19 again.
|
// Divide by 10^19 again.
|
||||||
let (n, rem) = udiv128::udivmod_1e19(n);
|
let (n, rem) = udiv128::udivmod_1e19(n);
|
||||||
let buf2 = buf_ptr.offset(curr - U64_MAX_LEN as isize) as *mut [MaybeUninit<u8>; U64_MAX_LEN];
|
let buf2 = unsafe { buf_ptr.offset(curr - U64_MAX_LEN as isize) as *mut [MaybeUninit<u8>; U64_MAX_LEN] };
|
||||||
curr -= rem.write(&mut *buf2).len() as isize;
|
curr -= rem.write(unsafe { &mut *buf2 }).len() as isize;
|
||||||
|
|
||||||
if n != 0 {
|
if n != 0 {
|
||||||
// Memset the leading zeros.
|
// Memset the leading zeros.
|
||||||
let target = buf.len() as isize - 38;
|
let target = buf.len() as isize - 38;
|
||||||
|
unsafe {
|
||||||
ptr::write_bytes(buf_ptr.offset(target), b'0', (curr - target) as usize);
|
ptr::write_bytes(buf_ptr.offset(target), b'0', (curr - target) as usize);
|
||||||
|
}
|
||||||
curr = target;
|
curr = target;
|
||||||
|
|
||||||
// There is at most one digit left
|
// There is at most one digit left
|
||||||
// because u128::max / 10^19 / 10^19 is 3.
|
// because u128::MAX / 10^19 / 10^19 is 3.
|
||||||
curr -= 1;
|
curr -= 1;
|
||||||
|
unsafe {
|
||||||
*buf_ptr.offset(curr) = (n as u8) + b'0';
|
*buf_ptr.offset(curr) = (n as u8) + b'0';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if !is_nonnegative {
|
if !is_nonnegative {
|
||||||
curr -= 1;
|
curr -= 1;
|
||||||
|
unsafe {
|
||||||
*buf_ptr.offset(curr) = b'-';
|
*buf_ptr.offset(curr) = b'-';
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
let len = buf.len() - curr as usize;
|
let len = buf.len() - curr as usize;
|
||||||
let bytes = slice::from_raw_parts(buf_ptr.offset(curr), len);
|
let bytes = unsafe { slice::from_raw_parts(buf_ptr.offset(curr), len) };
|
||||||
str::from_utf8_unchecked(bytes)
|
unsafe { str::from_utf8_unchecked(bytes) }
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue