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:13:14 +02:00
parent 07c4906af8
commit 1fd3fc0383
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib.rs
View File

@ -135,8 +135,9 @@ impl AsciiTable {
let mut result = String::new(); let mut result = String::new();
result.push_str(&self.format_first(&widths)); result.push_str(&self.format_first(&widths));
if has_header { if has_header {
let default_conf = &DEFAULT_COLUMN;
let header: Vec<_> = (0..num_cols).map(|a| let header: Vec<_> = (0..num_cols).map(|a|
self.columns.get(&a).unwrap_or(&DEFAULT_COLUMN).header.clone() self.columns.get(&a).unwrap_or(default_conf).header.as_str()
).collect(); ).collect();
result.push_str(&self.format_header_row(&header, &widths)); result.push_str(&self.format_header_row(&header, &widths));
result.push_str(&self.format_middle(&widths)); result.push_str(&self.format_middle(&widths));
@ -233,14 +234,14 @@ impl AsciiTable {
let width = widths[a]; let width = widths[a];
let default_conf = &DEFAULT_COLUMN; let default_conf = &DEFAULT_COLUMN;
let conf = self.columns.get(&a).unwrap_or(default_conf); let conf = self.columns.get(&a).unwrap_or(default_conf);
self.make_cell(cell, width, ' ', conf.align) self.format_cell(cell, width, ' ', conf.align)
}).collect(); }).collect();
self.format_line(&row, &format!("{}{}", NS, ' '), &format!("{}{}{}", ' ', NS, ' '), &format!("{}{}", ' ', NS)) self.format_line(&row, &format!("{}{}", NS, ' '), &format!("{}{}{}", ' ', NS, ' '), &format!("{}{}", ' ', NS))
} }
fn format_header_row(&self, row: &[String], widths: &[usize]) -> String { fn format_header_row(&self, row: &[&str], widths: &[usize]) -> String {
let row: Vec<String> = row.iter().zip(widths.iter()).map(|(cell, &width)| let row: Vec<String> = row.iter().zip(widths.iter()).map(|(cell, &width)|
self.make_cell(&cell, width, ' ', Align::Left) self.format_cell(cell, width, ' ', Align::Left)
).collect(); ).collect();
self.format_line(&row, &format!("{}{}", NS, ' '), &format!("{}{}{}", ' ', NS, ' '), &format!("{}{}", ' ', NS)) self.format_line(&row, &format!("{}{}", NS, ' '), &format!("{}{}{}", ' ', NS, ' '), &format!("{}{}", ' ', NS))
} }
@ -250,7 +251,7 @@ impl AsciiTable {
self.format_line(&row, &format!("{}{}", NE, EW), &format!("{}{}{}", EW, NEW, EW), &format!("{}{}", EW, NW)) self.format_line(&row, &format!("{}{}", NE, EW), &format!("{}{}{}", EW, NEW, EW), &format!("{}{}", EW, NW))
} }
fn make_cell(&self, text: &str, len: usize, pad: char, align: Align) -> String { fn format_cell(&self, text: &str, len: usize, pad: char, align: Align) -> String {
if text.chars().count() > len { if text.chars().count() > len {
let mut result: String = text.chars().take(len).collect(); let mut result: String = text.chars().take(len).collect();
if result.pop().is_some() { if result.pop().is_some() {