Merge pull request #7722 from nyurik/fmt-fix

cakebaker · web-flow · commit da61ebf1f606 · 2025-04-11T10:20:30.000+02:00
chore: minor fmt match cleanup
diff --git a/src/uu/fmt/src/fmt.rs b/src/uu/fmt/src/fmt.rs
@@ -110,9 +110,12 @@ impl FmtOptions {
                 }
                 (w, g)
             }
-            (Some(w), None) => {
+            (Some(0), None) => {
                 // Only allow a goal of zero if the width is set to be zero
-                let g = (w * DEFAULT_GOAL_TO_WIDTH_RATIO / 100).max(if w == 0 { 0 } else { 1 });
+                (0, 0)
+            }
+            (Some(w), None) => {
+                let g = (w * DEFAULT_GOAL_TO_WIDTH_RATIO / 100).max(1);
                 (w, g)
             }
             (None, Some(g)) => {

Original file line number	Diff line number	Diff line change
`@@ -110,9 +110,12 @@ impl FmtOptions {`
`110`	`110`	`}`
`111`	`111`	`(w, g)`
`112`	`112`	`}`
`113`		`- (Some(w), None) => {`
	`113`	`+ (Some(0), None) => {`
`114`	`114`	`// Only allow a goal of zero if the width is set to be zero`
`115`		`- let g = (w * DEFAULT_GOAL_TO_WIDTH_RATIO / 100).max(if w == 0 { 0 } else { 1 });`
	`115`	`+ (0, 0)`
	`116`	`+ }`
	`117`	`+ (Some(w), None) => {`
	`118`	`+ let g = (w * DEFAULT_GOAL_TO_WIDTH_RATIO / 100).max(1);`
`116`	`119`	`(w, g)`
`117`	`120`	`}`
`118`	`121`	`(None, Some(g)) => {`