From d30f3750781d56eeefa93465df7419cbe4788d07 Mon Sep 17 00:00:00 2001 From: zwPapEr Date: Sat, 11 Jan 2020 16:15:46 +0800 Subject: revert the match to if else for blocks --- src/flags.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/flags.rs b/src/flags.rs index 8564dbe..1d3b860 100644 --- a/src/flags.rs +++ b/src/flags.rs @@ -98,17 +98,19 @@ impl Flags { None => usize::max_value(), }; - let mut blocks: Vec = match () { - _ if !blocks_inputs.is_empty() => blocks_inputs.into_iter().map(Block::from).collect(), - _ if matches.is_present("long") => vec![ + let mut blocks: Vec = if !blocks_inputs.is_empty() { + blocks_inputs.into_iter().map(Block::from).collect() + } else if matches.is_present("long") { + vec![ Block::Permission, Block::User, Block::Group, Block::Size, Block::Date, Block::Name, - ], - _ => vec![Block::Name], + ] + } else { + vec![Block::Name] }; // Add inode as first column if with inode flag -- cgit v1.2.3