RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

Merge pull request #4263 from cakebaker/od_cleanup_format_strings

Browse source 
od: remove "width = width" from format strings
This commit is contained in:
Sylvestre Ledru 2023-01-22 21:32:59 +01:00 • committed by GitHub
commit 2df4aaccd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/uu/od/src/prn_float.rs
View file

@ -47,7 +47,7 @@ fn format_flo32(f: f32) -> String {
if f.classify() == FpCategory::Subnormal { if f.classify() == FpCategory::Subnormal {
// subnormal numbers will be normal as f64, so will print with a wrong precision // subnormal numbers will be normal as f64, so will print with a wrong precision
format!("{:width$e}", f, width = width) // subnormal numbers format!("{:width$e}", f) // subnormal numbers
} else { } else {
format_float(f64::from(f), width, precision) format_float(f64::from(f), width, precision)
} }
@ -60,12 +60,12 @@ fn format_flo64(f: f64) -> String {
fn format_float(f: f64, width: usize, precision: usize) -> String { fn format_float(f: f64, width: usize, precision: usize) -> String {
if !f.is_normal() { if !f.is_normal() {
if f == -0.0 && f.is_sign_negative() { if f == -0.0 && f.is_sign_negative() {
return format!("{:>width$}", "-0", width = width); return format!("{:>width$}", "-0");
} }
if f == 0.0 || !f.is_finite() { if f == 0.0 || !f.is_finite() {
return format!("{:width$}", f, width = width); return format!("{:width$}", f);
} }
return format!("{:width$e}", f, width = width); // subnormal numbers return format!("{:width$e}", f); // subnormal numbers
} }
let mut l = f.abs().log10().floor() as i32; let mut l = f.abs().log10().floor() as i32;
@ -77,16 +77,11 @@ fn format_float(f: f64, width: usize, precision: usize) -> String {
} }
if l >= 0 && l <= (precision as i32 - 1) { if l >= 0 && l <= (precision as i32 - 1) {
format!( format!("{:width$.dec$}", f, dec = (precision - 1) - l as usize)
"{:width$.dec$}",
f,
width = width,
dec = (precision - 1) - l as usize
)
} else if l == -1 { } else if l == -1 {
format!("{:width$.dec$}", f, width = width, dec = precision) format!("{:width$.dec$}", f, dec = precision)
} else { } else {
format!("{:width$.dec$e}", f, width = width, dec = precision - 1) format!("{:width$.dec$e}", f, dec = precision - 1)
} }
} }