Remove entries as they're rendered

[tablify] / src / lib.rs
diff --git a/src/lib.rs b/src/lib.rs

index 3e0efd0d68751ce974401dbfd3c66fd4c0e5f23f..c5761d86fc8c9bdd337897d5e9dc678ef00dbdef 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -194,7 +194,7 @@ fn render_instance(instance: &Option<String>) -> HTML {
      }
  }
  
-fn render_cell(col: &str, row: &Row) -> HTML {
+fn render_cell(col: &str, row: &mut Row) -> HTML {
      let row_label = HTML::escape(row.label.as_ref());
      let col_label = HTML::escape(col);
      let instances: Option<&Vec<Option<String>>> = row.entries.get(col);
@@ -218,10 +218,11 @@ fn render_cell(col: &str, row: &Row) -> HTML {
                  .join(" "),
          )
      };
+    row.entries.remove(col);
      HTML(format!("<td class=\"{class}\" onmouseover=\"h2('{row_label}','{col_label}')\" onmouseout=\"ch2('{row_label}','{col_label}')\">{contents}</td>"))
  }
  
-fn render_row(columns: &[String], row: &Row) -> HTML {
+fn render_row(columns: &[String], row: &mut Row) -> HTML {
      let row_label = HTML::escape(row.label.as_ref());
      HTML(format!(
          "<tr><th id=\"{row_label}\">{row_label}</th>{}</tr>\n",
@@ -261,7 +262,7 @@ pub fn tablify(config: &Config, input: impl std::io::Read) -> Result<HTML, std::
          "{HEADER}{}{}{FOOTER}",
          render_column_headers(&columns),
          rows.into_iter()
-            .map(|r| render_row(&columns, &r))
+            .map(|mut r| render_row(&columns, &mut r))
              .collect::<HTML>()
      )))
  }
@@ -437,7 +438,7 @@ mod tests {
          assert_eq!(
              render_cell(
                  "foo",
-                &Row {
+                &mut Row {
                      label: "nope".to_owned(),
                      entries: HashMap::new(),
                  }
@@ -447,7 +448,7 @@ mod tests {
          assert_eq!(
              render_cell(
                  "foo",
-                &Row {
+                &mut Row {
                      label: "nope".to_owned(),
                      entries: HashMap::from([("bar".to_owned(), vec![None])]),
                  }
@@ -457,7 +458,7 @@ mod tests {
          assert_eq!(
              render_cell(
                  "foo",
-                &Row {
+                &mut Row {
                      label: "nope".to_owned(),
                      entries: HashMap::from([("foo".to_owned(), vec![None])]),
                  }
@@ -467,7 +468,7 @@ mod tests {
          assert_eq!(
              render_cell(
                  "foo",
-                &Row {
+                &mut Row {
                      label: "nope".to_owned(),
                      entries: HashMap::from([("foo".to_owned(), vec![None, None])]),
                  }
@@ -477,7 +478,7 @@ mod tests {
          assert_eq!(
              render_cell(
                  "foo",
-                &Row {
+                &mut Row {
                      label: "nope".to_owned(),
                      entries: HashMap::from([("foo".to_owned(), vec![Some("5".to_owned()), Some("10".to_owned())])]),
                  }
@@ -487,7 +488,7 @@ mod tests {
          assert_eq!(
              render_cell(
                  "foo",
-                &Row {
+                &mut Row {
                      label: "nope".to_owned(),
                      entries: HashMap::from([("foo".to_owned(), vec![Some("5".to_owned()), None])]),
                  }
@@ -497,7 +498,7 @@ mod tests {
          assert_eq!(
              render_cell(
                  "heart",
-                &Row {
+                &mut Row {
                      label: "nope".to_owned(),
                      entries: HashMap::from([("heart".to_owned(), vec![Some("<3".to_owned())])]),
                  }
@@ -507,12 +508,26 @@ mod tests {
          assert_eq!(
              render_cell(
                  "foo",
-                &Row {
+                &mut Row {
                      label: "bob's".to_owned(),
                      entries: HashMap::from([("foo".to_owned(), vec![None])]),
                  }
              ),
              HTML::from("<td class=\"yes\" onmouseover=\"h2('bob&#39;s','foo')\" onmouseout=\"ch2('bob&#39;s','foo')\"></td>")
          );
+        let mut r = Row {
+            label: "nope".to_owned(),
+            entries: HashMap::from([
+                ("foo".to_owned(), vec![None]),
+                ("baz".to_owned(), vec![None]),
+            ]),
+        };
+        assert_eq!(r.entries.len(), 2);
+        render_cell("foo", &mut r);
+        assert_eq!(r.entries.len(), 1);
+        render_cell("bar", &mut r);
+        assert_eq!(r.entries.len(), 1);
+        render_cell("baz", &mut r);
+        assert_eq!(r.entries.len(), 0);
      }
  }