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

Refactoring.

Browse Source
This commit is contained in:
Gerrit Viljoen 2019-05-14 16:09:38 +02:00
parent 0f8b201faf
commit 74daa02759
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib.rs
View File

@ -169,36 +169,36 @@ fn format_empty() -> String {
+ &format_last(&vec![0])
}
fn format_first(widths: &Vec<u32>) -> String {
fn format_first(widths: &[u32]) -> String {
let row: Vec<String> = widths.iter().map(|x| EW.repeat(*x as usize)).collect();
format_line(&row, &format!("{}{}", SE, EW), &format!("{}{}{}", EW, EWS, EW), &format!("{}{}", EW, SW))
}
fn format_middle(widths: &Vec<u32>) -> String {
fn format_middle(widths: &[u32]) -> String {
let row: Vec<String> = widths.iter().map(|x| EW.repeat(*x as usize)).collect();
format_line(&row, &format!("{}{}", NES, EW), &format!("{}{}{}", EW, NEWS, EW), &format!("{}{}", EW, NWS))
}
fn format_row(row: &Vec<String>, conf: &TableConfig, widths: &Vec<u32>) -> String {
fn format_row(row: &[String], conf: &TableConfig, widths: &[u32]) -> String {
let row: Vec<String> = row.iter().zip(widths.iter()).zip(conf.columns.iter()).map(|((cell, width), (_, conf))|
make_cell(&cell, *width as usize, ' ', &conf.align)
make_cell(&cell, *width as usize, ' ', conf.align)
).collect();
format_line(&row, &format!("{}{}", NS, ' '), &format!("{}{}{}", ' ', NS, ' '), &format!("{}{}", ' ', NS))
}
fn format_row2(row: &Vec<String>, widths: &Vec<u32>) -> String {
fn format_row2(row: &[String], widths: &[u32]) -> String {
let row: Vec<String> = row.iter().zip(widths.iter()).map(|(cell, width)|
make_cell(&cell, *width as usize, ' ', &Align::Left)
make_cell(&cell, *width as usize, ' ', Align::Left)
).collect();
format_line(&row, &format!("{}{}", NS, ' '), &format!("{}{}{}", ' ', NS, ' '), &format!("{}{}", ' ', NS))
}
fn format_last(widths: &Vec<u32>) -> String {
fn format_last(widths: &[u32]) -> String {
let row: Vec<String> = widths.iter().map(|x| EW.repeat(*x as usize)).collect();
format_line(&row, &format!("{}{}", NE, EW), &format!("{}{}{}", EW, NEW, EW), &format!("{}{}", EW, NW))
}
fn make_cell(text: &str, len: usize, pad: char, align: &Align) -> String {
fn make_cell(text: &str, len: usize, pad: char, align: Align) -> String {
if text.chars().count() > len {
let mut result: String = text.chars().take(len).collect();
if let Some(_) = result.pop() {result.push('+')};