From 745bcce02a745be32d1bc317366a455fb320e171 Mon Sep 17 00:00:00 2001 From: Ben S Date: Sat, 28 Jun 2014 15:17:57 +0100 Subject: [PATCH] Replace messy line with calls to get --- exa.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/exa.rs b/exa.rs index 7b008ed..92df0fe 100644 --- a/exa.rs +++ b/exa.rs @@ -96,16 +96,16 @@ fn exa(options: &Options, print_header: bool, string: String) { .collect(); for (field_lengths, row) in lengths.iter().zip(table.iter()) { - 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 + for (num, column) in options.columns.iter().enumerate() { if num != 0 { print!(" "); } if num == options.columns.len() - 1 { - print!("{}", cell); + print!("{}", row.get(num)); } else { - print!("{}", column.alignment().pad_string(cell, *field_length, *column_length)); + print!("{}", column.alignment().pad_string(row.get(num), *field_lengths.get(num), *column_widths.get(num))); } } print!("\n");