arnekeller/ascii-table
1
0
Fork 0
mirror of https://gitlab.com/arnekeller/ascii-table.git synced 2024-12-04 21:49:08 +00:00
Code Issues Projects Releases Wiki Activity

Optimisation.

Browse Source
This commit is contained in:
Gerrit Viljoen 2020-04-01 21:02:51 +02:00
parent 06446170a6
commit 6209ada254
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib.rs
View File

@ -123,11 +123,11 @@ impl AsciiTable {
}
fn format_inner(&self, data: Vec<Vec<String>>) -> String {
if !self.valid(&data) {
let num_cols = data.iter().map(|row| row.len()).max().unwrap_or(0);
if !self.valid(&data, num_cols) {
return self.format_empty()
}
let num_cols = data.iter().map(|row| row.len()).max().unwrap_or(0);
let data = self.square_data(data, num_cols);
let has_header = self.columns.iter().any(|(_, col)| !col.header.is_empty());
let widths = self.column_widths(&data, num_cols);
@ -148,12 +148,12 @@ impl AsciiTable {
result
}
fn valid(&self, data: &[Vec<String>]) -> bool {
fn valid(&self, data: &Vec<Vec<String>>, num_cols: usize) -> bool {
if data.len() == 0 {
false
} else if self.width < 4 {
false
} else if data.iter().map(|row| row.len()).max().unwrap_or(0) == 0 {
} else if num_cols == 0 {
false
} else {
true