From e8657dffc83621d84240320f5389b81ab8204c78 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Mon, 19 Aug 2024 12:29:52 -0700 Subject: [PATCH] Make a place in Entrty for instance data --- src/lib.rs | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 245a47a..bebbcf7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -39,7 +39,18 @@ const FOOTER: &str = " "; #[derive(Debug, PartialEq, Eq, Hash)] -struct Entry(String); +struct Entry { + col: String, + instance: String, +} +impl From<&str> for Entry { + fn from(value: &str) -> Entry { + Entry { + col: String::from(value), + instance: String::from(""), + } + } +} #[derive(Debug, PartialEq, Eq)] struct RowInput { @@ -81,7 +92,7 @@ impl>> Iterator for Reader n + 1 )))) } - Some(ref mut row) => row.entries.push(Entry(String::from(line.trim()))), + Some(ref mut row) => row.entries.push(Entry::from(line.trim())), }, Some((_, Ok(line))) => { let prev = std::mem::take(&mut self.row); @@ -107,7 +118,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.0)) + cs.entry(String::from(&e.col)) .and_modify(|n| *n += 1) .or_insert(1); cs @@ -168,7 +179,7 @@ mod tests { read_rows(&b"foo\n bar\n"[..]).flatten().collect::>(), vec![RowInput { label: String::from("foo"), - entries: vec![Entry(String::from("bar"))] + entries: vec![Entry::from("bar")] }] ); assert_eq!( @@ -177,7 +188,7 @@ mod tests { .collect::>(), vec![RowInput { label: String::from("foo"), - entries: vec![Entry(String::from("bar")), Entry(String::from("baz"))] + entries: vec![Entry::from("bar"), Entry::from("baz")] }] ); assert_eq!( @@ -216,7 +227,7 @@ mod tests { .collect::>(), vec![RowInput { label: String::from("foo"), - entries: vec![Entry(String::from("bar"))] + entries: vec![Entry::from("bar")] }] ); -- 2.44.1