nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the need to provide the maximum number of digits to impl_Display macro

Browse Source
This commit is contained in:
Guillaume Gomez 2024-10-01 12:01:55 +02:00
parent 884e0f0a68
commit 1562bf7909
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
library/core/src/fmt/num.rs
View File

@ -208,7 +208,7 @@ static DEC_DIGITS_LUT: &[u8; 200] = b"0001020304050607080910111213141516171819\
8081828384858687888990919293949596979899"; 8081828384858687888990919293949596979899";
macro_rules! impl_Display { macro_rules! impl_Display {
($($t:ident => $size:literal $(as $positive:ident)? named $name:ident,)* ; as $u:ident via $conv_fn:ident named $gen_name:ident) => { ($($t:ident $(as $positive:ident)? named $name:ident,)* ; as $u:ident via $conv_fn:ident named $gen_name:ident) => {
$( $(
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
@ -248,8 +248,9 @@ macro_rules! impl_Display {
#[cfg(not(feature = "optimize_for_size"))] #[cfg(not(feature = "optimize_for_size"))]
impl $t { impl $t {
fn _fmt(mut self: $t, is_nonnegative: bool, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn _fmt(mut self: $t, is_nonnegative: bool, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let mut buf = [MaybeUninit::<u8>::uninit(); $size]; const SIZE: usize = $t::MAX.ilog(10) as usize + 1;
let mut curr = $size; let mut buf = [MaybeUninit::<u8>::uninit(); SIZE];
let mut curr = SIZE;
let buf_ptr = MaybeUninit::slice_as_mut_ptr(&mut buf); let buf_ptr = MaybeUninit::slice_as_mut_ptr(&mut buf);
let lut_ptr = DEC_DIGITS_LUT.as_ptr(); let lut_ptr = DEC_DIGITS_LUT.as_ptr();
@ -526,16 +527,16 @@ macro_rules! impl_Exp {
mod imp { mod imp {
use super::*; use super::*;
impl_Display!( impl_Display!(
i8 => 3 as u8 named fmt_i8, i8 as u8 named fmt_i8,
u8 => 3 named fmt_u8, u8 named fmt_u8,
i16 => 5 as u16 named fmt_i16, i16 as u16 named fmt_i16,
u16 => 5 named fmt_u16, u16 named fmt_u16,
i32 => 10 as u32 named fmt_i32, i32 as u32 named fmt_i32,
u32 => 10 named fmt_u32, u32 named fmt_u32,
i64 => 19 as u64 named fmt_i64, i64 as u64 named fmt_i64,
u64 => 20 named fmt_u64, u64 named fmt_u64,
isize => 19 as usize named fmt_isize, isize as usize named fmt_isize,
usize => 20 named fmt_usize, usize named fmt_usize,
; as u64 via to_u64 named fmt_u64 ; as u64 via to_u64 named fmt_u64
); );
impl_Exp!( impl_Exp!(
@ -548,18 +549,18 @@ mod imp {
mod imp { mod imp {
use super::*; use super::*;
impl_Display!( impl_Display!(
i8 => 3 as u8 named fmt_i8, i8 as u8 named fmt_i8,
u8 => 3 named fmt_u8, u8 named fmt_u8,
i16 => 5 as u16 named fmt_i16, i16 as u16 named fmt_i16,
u16 => 5 named fmt_u16, u16 named fmt_u16,
i32 => 10 as u32 named fmt_i32, i32 as u32 named fmt_i32,
u32 => 10 named fmt_u32, u32 named fmt_u32,
isize => 19 as usize named fmt_isize, isize as usize named fmt_isize,
usize => 20 named fmt_usize, usize named fmt_usize,
; as u32 via to_u32 named fmt_u32); ; as u32 via to_u32 named fmt_u32);
impl_Display!( impl_Display!(
i64 => 19 as u64 named fmt_i64, i64 as u64 named fmt_i64,
u64 => 20 named fmt_u64, u64 named fmt_u64,
; as u64 via to_u64 named fmt_u64); ; as u64 via to_u64 named fmt_u64);
impl_Exp!(i8, u8, i16, u16, i32, u32, isize, usize as u32 via to_u32 named exp_u32); impl_Exp!(i8, u8, i16, u16, i32, u32, isize, usize as u32 via to_u32 named exp_u32);