From: Scott Worley Date: Mon, 19 Aug 2024 19:21:49 +0000 (-0700) Subject: Entry type X-Git-Tag: v0.2.0~11 X-Git-Url: http://git.scottworley.com/tablify/commitdiff_plain/14e9852b53792c9f575de03d6a4349a00a4320b4?ds=sidebyside Entry type --- diff --git a/src/lib.rs b/src/lib.rs index c2da4c9..245a47a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -38,10 +38,13 @@ const FOOTER: &str = " "; +#[derive(Debug, PartialEq, Eq, Hash)] +struct Entry(String); + #[derive(Debug, PartialEq, Eq)] struct RowInput { label: String, - entries: Vec, + entries: Vec, } struct Reader>> { @@ -78,7 +81,7 @@ impl>> Iterator for Reader n + 1 )))) } - Some(ref mut row) => row.entries.push(String::from(line.trim())), + Some(ref mut row) => row.entries.push(Entry(String::from(line.trim()))), }, Some((_, Ok(line))) => { let prev = std::mem::take(&mut self.row); @@ -104,7 +107,7 @@ fn column_counts(rows: &[RowInput]) -> Vec<(usize, String)> { .iter() .flat_map(|r| r.entries.iter().collect::>().into_iter()) .fold(HashMap::new(), |mut cs, e| { - cs.entry(String::from(e)) + cs.entry(String::from(&e.0)) .and_modify(|n| *n += 1) .or_insert(1); cs @@ -165,7 +168,7 @@ mod tests { read_rows(&b"foo\n bar\n"[..]).flatten().collect::>(), vec![RowInput { label: String::from("foo"), - entries: vec![String::from("bar")] + entries: vec![Entry(String::from("bar"))] }] ); assert_eq!( @@ -174,7 +177,7 @@ mod tests { .collect::>(), vec![RowInput { label: String::from("foo"), - entries: vec![String::from("bar"), String::from("baz")] + entries: vec![Entry(String::from("bar")), Entry(String::from("baz"))] }] ); assert_eq!( @@ -213,7 +216,7 @@ mod tests { .collect::>(), vec![RowInput { label: String::from("foo"), - entries: vec![String::from("bar")] + entries: vec![Entry(String::from("bar"))] }] );