From 355ca516176b1fbfe65d376eef12f64d930d18ec Mon Sep 17 00:00:00 2001 From: Ben S Date: Fri, 20 Jun 2014 19:43:15 +0100 Subject: [PATCH] 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. --- exa.rs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/exa.rs b/exa.rs index a9549c6..40fa2bd 100644 --- a/exa.rs +++ b/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"); }