From 58b5f36de045c760efa51b21a6d841f5b62558db Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Mon, 19 Aug 2024 11:28:02 -0700 Subject: [PATCH] Sort column counts --- src/lib.rs | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index c7271f3..fcf5dc8 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -69,16 +69,21 @@ fn read_rows(input: impl std::io::Read) -> impl Iterator HashMap { - rows.iter() +fn column_counts(rows: &[RowInput]) -> Vec<(usize, String)> { + let mut counts: Vec<_> = rows + .iter() .flat_map(|r| r.entries.iter().collect::>().into_iter()) - .fold(HashMap::new(), |mut counts, e| { - counts - .entry(String::from(e)) - .and_modify(|c| *c += 1) + .fold(HashMap::new(), |mut cs, e| { + cs.entry(String::from(e)) + .and_modify(|n| *n += 1) .or_insert(1); - counts + cs }) + .into_iter() + .map(|(col, n)| (n, col)) + .collect(); + counts.sort(); + counts } pub fn tablify(_input: &impl std::io::Read) -> String { @@ -191,7 +196,7 @@ mod tests { .collect::, _>>() .unwrap() ), - HashMap::from([(String::from("bar"), 1), (String::from("baz"), 1)]) + vec![(1, String::from("bar")), (1, String::from("baz"))] ); assert_eq!( column_counts( @@ -199,7 +204,7 @@ mod tests { .collect::, _>>() .unwrap() ), - HashMap::from([(String::from("bar"), 1), (String::from("baz"), 2)]) + vec![(1, String::from("bar")), (2, String::from("baz"))] ); assert_eq!( column_counts( @@ -207,7 +212,7 @@ mod tests { .collect::, _>>() .unwrap() ), - HashMap::from([(String::from("bar"), 1), (String::from("baz"), 2)]) + vec![(1, String::from("bar")), (2, String::from("baz"))] ); } } -- 2.44.1