mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #89502 - FabianWolff:issue-89493, r=joshtriplett

Browse Source 
Fix Lower/UpperExp formatting for integers and precision zero

Fixes the integer part of #89493 (I daren't touch the floating-point formatting code). The issue is that the "subtracted" precision essentially behaves like extra trailing zeros, but this is not currently reflected in the code properly.
This commit is contained in:
Manish Goregaokar 2021-10-05 12:52:46 -07:00 committed by GitHub
commit 4e8c853c9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -305,7 +305,6 @@ macro_rules! impl_Exp {
n /= 10; n /= 10;
exponent += 1; exponent += 1;
} }
let trailing_zeros = exponent;
let (added_precision, subtracted_precision) = match f.precision() { let (added_precision, subtracted_precision) = match f.precision() {
Some(fmt_prec) => { Some(fmt_prec) => {
@ -333,7 +332,7 @@ macro_rules! impl_Exp {
n += 1; n += 1;
} }
} }
(n, exponent, trailing_zeros, added_precision) (n, exponent, exponent, added_precision)
}; };
// 39 digits (worst case u128) + . = 40 // 39 digits (worst case u128) + . = 40

1
library/core/tests/fmt/num.rs
View File

@ -146,6 +146,7 @@ fn test_format_int_exp_precision() {
assert_eq!(format!("{:.1000e}", 1), format!("1.{}e0", "0".repeat(1000))); assert_eq!(format!("{:.1000e}", 1), format!("1.{}e0", "0".repeat(1000)));
//test zero precision //test zero precision
assert_eq!(format!("{:.0e}", 1), format!("1e0",)); assert_eq!(format!("{:.0e}", 1), format!("1e0",));
assert_eq!(format!("{:.0e}", 35), format!("4e1",));
//test padding with precision (and sign) //test padding with precision (and sign)
assert_eq!(format!("{:+10.3e}", 1), " +1.000e0"); assert_eq!(format!("{:+10.3e}", 1), " +1.000e0");