From ca266cf6050aa7da8f6c43e5bec050f2710faf62 Mon Sep 17 00:00:00 2001 From: tyler Date: Mon, 5 Oct 2020 07:28:42 -0500 Subject: [PATCH] replace nested if w/ match in get_tree_chars --- src/display.rs | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/src/display.rs b/src/display.rs index ddf3fe5..39c6539 100644 --- a/src/display.rs +++ b/src/display.rs @@ -32,32 +32,16 @@ pub struct DisplayData { } impl DisplayData { - #[allow(clippy::collapsible_if)] fn get_tree_chars(&self, was_i_last: bool, has_children: bool) -> &'static str { - if self.is_reversed { - if was_i_last { - if has_children { - "┌─┴" - } else { - "┌──" - } - } else if has_children { - "├─┴" - } else { - "├──" - } - } else { - if was_i_last { - if has_children { - "└─┬" - } else { - "└──" - } - } else if has_children { - "├─┬" - } else { - "├──" - } + match (self.is_reversed, was_i_last, has_children) { + (true, true, true) => "┌─┴", + (true, true, false) => "┌──", + (true, false, true) => "├─┴", + (true, _, _) => "├──", + (false, true, true) => "└─┬", + (false, true, false) => "└──", + (false, false, true) => "├─┬", + (false, false, false) => "├──", } }