Make a place in Entrty for instance data

diff --git a/src/lib.rs b/src/lib.rs
index 245a47ae469dae6a426f471b1297701432167494..bebbcf799792f0de82ad9d65bbe8543a0ddda01b 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -39,7 +39,18 @@ const FOOTER: &str = "    </tbody>
 </html>";
 
 #[derive(Debug, PartialEq, Eq, Hash)]
 </html>";
 
 #[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 {
 
 #[derive(Debug, PartialEq, Eq)]
 struct RowInput {


@@ -81,7 +92,7 @@ impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader
                             n + 1
                         ))))
                     }
                             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);
                 },
                 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::<HashSet<_>>().into_iter())
         .fold(HashMap::new(), |mut cs, e| {
         .iter()
         .flat_map(|r| r.entries.iter().collect::<HashSet<_>>().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
                 .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<_>>(),
             vec![RowInput {
                 label: String::from("foo"),
             read_rows(&b"foo\n bar\n"[..]).flatten().collect::<Vec<_>>(),
             vec![RowInput {
                 label: String::from("foo"),

-                entries: vec![Entry(String::from("bar"))]
+                entries: vec![Entry::from("bar")]

             }]
         );
         assert_eq!(
             }]
         );
         assert_eq!(


@@ -177,7 +188,7 @@ mod tests {
                 .collect::<Vec<_>>(),
             vec![RowInput {
                 label: String::from("foo"),
                 .collect::<Vec<_>>(),
             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!(
             }]
         );
         assert_eq!(


@@ -216,7 +227,7 @@ mod tests {
                 .collect::<Vec<_>>(),
             vec![RowInput {
                 label: String::from("foo"),
                 .collect::<Vec<_>>(),
             vec![RowInput {
                 label: String::from("foo"),

-                entries: vec![Entry(String::from("bar"))]
+                entries: vec![Entry::from("bar")]

             }]
         );
 
             }]
         );