From: Scott Worley Date: Mon, 19 Aug 2024 19:55:11 +0000 (-0700) Subject: column_order() X-Git-Tag: v0.2.0~7 X-Git-Url: http://git.scottworley.com/tablify/commitdiff_plain/d22b2e05706f7a4367ac3df33d61383673724b8b?ds=sidebyside column_order() --- diff --git a/src/lib.rs b/src/lib.rs index 5b06e70..2dd3964 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -141,6 +141,12 @@ fn column_counts(rows: &[RowInput]) -> Vec<(usize, String)> { counts.sort(); counts } +fn column_order(rows: &[RowInput]) -> Vec { + column_counts(rows) + .into_iter() + .map(|(_, col)| col) + .collect() +} /// # Errors /// @@ -150,7 +156,7 @@ fn column_counts(rows: &[RowInput]) -> Vec<(usize, String)> { /// * an indented line with no preceding non-indented line pub fn tablify(input: impl std::io::Read) -> Result { let rows = read_rows(input).collect::, _>>()?; - let _columns = column_counts(&rows); + let _columns = column_order(&rows); Ok(String::from(HEADER) + "Hello, world!" + FOOTER) }