فهرست منبع

Stop adding spaces to the end of each line

This left-aligns the final column, but the final column is the file name, so that's okay.
Ben S 11 سال پیش
والد
کامیت
355ca51617
1فایلهای تغییر یافته به همراه9 افزوده شده و 6 حذف شده
  1. 9 6
      exa.rs

+ 9 - 6
exa.rs

@@ -71,14 +71,17 @@ fn exa(options: &Options, path: Path) {
         .collect();
 
     for (field_lengths, row) in lengths.iter().zip(table.iter()) {
-        let mut first = true;
-        for (((column_length, cell), field_length), column) in column_widths.iter().zip(row.iter()).zip(field_lengths.iter()).zip(options.columns.iter()) {  // this is getting messy
-            if first {
-                first = false;
-            } else {
+        for (((column_length, cell), field_length), (num, column)) in column_widths.iter().zip(row.iter()).zip(field_lengths.iter()).zip(options.columns.iter().enumerate()) {  // this is getting messy
+            if num != 0 {
                 print!(" ");
             }
-            print!("{}", column.alignment().pad_string(cell, *field_length, *column_length));
+            
+            if num == options.columns.len() - 1 {
+                print!("{}", cell);
+            }
+            else {
+                print!("{}", column.alignment().pad_string(cell, *field_length, *column_length));
+            }
         }
         print!("\n");
     }