diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2021-01-13 10:07:32 +0100 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2021-01-15 23:21:39 +0100 |
commit | 0abc08977e369e8b66c46476ea7b8b300ec7759a (patch) | |
tree | 576114f8679ffcbd9bf34e97b14c7dea6d461abb /src/commands/db.rs | |
parent | 60465175af9d3640e08c479077b87fda069a0f11 (diff) |
Fix clippy: this `else { if .. }` block can be collapsed
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'src/commands/db.rs')
-rw-r--r-- | src/commands/db.rs | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/src/commands/db.rs b/src/commands/db.rs index 551805d..c0785df 100644 --- a/src/commands/db.rs +++ b/src/commands/db.rs @@ -530,31 +530,29 @@ fn display_data<D: Display>(headers: Vec<ascii_table::Column>, data: Vec<Vec<D>> .and_then(|t| String::from_utf8(t).map_err(Error::from)) .and_then(|text| writeln!(lock, "{}", text).map_err(Error::from)) + } else if atty::is(atty::Stream::Stdout) { + let mut ascii_table = ascii_table::AsciiTable { + columns: Default::default(), + max_width: terminal_size::terminal_size() + .map(|tpl| tpl.0.0 as usize) // an ugly interface indeed! + .unwrap_or(80), + }; + + headers.into_iter() + .enumerate() + .for_each(|(i, c)| { + ascii_table.columns.insert(i, c); + }); + + ascii_table.print(data); + Ok(()) } else { - if atty::is(atty::Stream::Stdout) { - let mut ascii_table = ascii_table::AsciiTable { - columns: Default::default(), - max_width: terminal_size::terminal_size() - .map(|tpl| tpl.0.0 as usize) // an ugly interface indeed! - .unwrap_or(80), - }; - - headers.into_iter() - .enumerate() - .for_each(|(i, c)| { - ascii_table.columns.insert(i, c); - }); - - ascii_table.print(data); - Ok(()) - } else { - let out = std::io::stdout(); - let mut lock = out.lock(); - for list in data { - writeln!(lock, "{}", list.iter().map(|d| d.to_string()).join(" "))?; - } - Ok(()) + let out = std::io::stdout(); + let mut lock = out.lock(); + for list in data { + writeln!(lock, "{}", list.iter().map(|d| d.to_string()).join(" "))?; } + Ok(()) } } |