improve map formatting

kaikalii · kaikalii · commit 572cc0831297 · 2023-12-28T11:33:14.000-08:00
diff --git a/src/grid_fmt.rs b/src/grid_fmt.rs
@@ -186,7 +186,11 @@ impl<T: GridFmt + ArrayValue> GridFmt for Array<T> {
                         metagrid.push(vec![key, vec![" → ".chars().collect()], value]);
                     }
                     if empty_entries > 0 {
-                        metagrid.push(vec![vec![format!("… {empty_entries}").chars().collect()]])
+                        metagrid.push(vec![
+                            vec![format!("… {empty_entries}").chars().collect()],
+                            vec![],
+                            vec![],
+                        ])
                     }
                 }
             }
@@ -373,7 +377,7 @@ fn pad_grid_center(width: usize, height: usize, align_numbers: bool, grid: &mut
         row.truncate(width);
         if row.len() < width {
             let diff = width - row.len();
-            let post_pad = if align_numbers && row.last().map_or(false, char::is_ascii_digit) {
+            let post_pad = if align_numbers && row.last().is_some_and(char::is_ascii_digit) {
                 0
             } else {
                 (diff + 1) / 2

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,11 @@ impl<T: GridFmt + ArrayValue> GridFmt for Array<T> {`
`186`	`186`	`metagrid.push(vec![key, vec![" → ".chars().collect()], value]);`
`187`	`187`	`}`
`188`	`188`	`if empty_entries > 0 {`
`189`		`- metagrid.push(vec![vec![format!("… {empty_entries}").chars().collect()]])`
	`189`	`+ metagrid.push(vec![`
	`190`	`+ vec![format!("… {empty_entries}").chars().collect()],`
	`191`	`+ vec![],`
	`192`	`+ vec![],`
	`193`	`+ ])`
`190`	`194`	`}`
`191`	`195`	`}`
`192`	`196`	`}`
`@@ -373,7 +377,7 @@ fn pad_grid_center(width: usize, height: usize, align_numbers: bool, grid: &mut`
`373`	`377`	`row.truncate(width);`
`374`	`378`	`if row.len() < width {`
`375`	`379`	`let diff = width - row.len();`
`376`		`- let post_pad = if align_numbers && row.last().map_or(false, char::is_ascii_digit) {`
	`380`	`+ let post_pad = if align_numbers && row.last().is_some_and(char::is_ascii_digit) {`
`377`	`381`	`0`
`378`	`382`	`} else {`
`379`	`383`	`(diff + 1) / 2`