X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/1dda21e604ca2fb9631d8f0cb56b4a82382cfeee..92476edc57b23a42c640f55f3a00b69bbee809b5:/src/lib.rs diff --git a/src/lib.rs b/src/lib.rs index 1aee978..2e9bfcc 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -159,6 +159,7 @@ fn render_instance(entry: &Entry) -> String { fn render_cell(col: &str, row: &RowInput) -> String { // TODO: Escape HTML special characters + let row_label = &row.label; let entries: Vec<&Entry> = row.entries.iter().filter(|e| e.col == col).collect(); let class = if entries.is_empty() { "" } else { "yes" }; let all_empty = entries.iter().all(|e| e.instance.is_none()); @@ -172,15 +173,15 @@ fn render_cell(col: &str, row: &RowInput) -> String { .map(|i| render_instance(i)) .collect::() }; - format!("{}", contents.trim()) + format!("{}", contents.trim()) } fn render_row(columns: &[String], row: &RowInput) -> String { // This is O(n^2) & doesn't need to be // TODO: Escape HTML special characters + let row_label = &row.label; format!( - "{}{}\n", - row.label, + "{row_label}{}\n", &columns .iter() .map(|col| render_cell(col, row)) @@ -190,12 +191,12 @@ fn render_row(columns: &[String], row: &RowInput) -> String { fn render_column_headers(columns: &[String]) -> String { // TODO: Escape HTML special characters - String::from("") + String::from("") + &columns.iter().fold(String::new(), |mut acc, c| { - write!(&mut acc, "{c}").unwrap(); + write!(&mut acc, "
{c}
").unwrap(); acc }) - + "\n" + + "\n" } /// # Errors @@ -385,7 +386,7 @@ mod tests { entries: vec![] } ), - String::from("") + String::from("") ); assert_eq!( render_cell( @@ -395,7 +396,7 @@ mod tests { entries: vec![Entry::from("bar")] } ), - String::from("") + String::from("") ); assert_eq!( render_cell( @@ -405,7 +406,7 @@ mod tests { entries: vec![Entry::from("foo")] } ), - String::from("") + String::from("") ); assert_eq!( render_cell( @@ -415,7 +416,7 @@ mod tests { entries: vec![Entry::from("foo"), Entry::from("foo")] } ), - String::from("2") + String::from("2") ); assert_eq!( render_cell( @@ -425,7 +426,7 @@ mod tests { entries: vec![Entry::from("foo: 5"), Entry::from("foo: 10")] } ), - String::from("5 10") + String::from("5 10") ); assert_eq!( render_cell( @@ -435,7 +436,7 @@ mod tests { entries: vec![Entry::from("foo: 5"), Entry::from("foo")] } ), - String::from("5 ✓") + String::from("5 ✓") ); } }