Plumb Config into render_all_leftovers()

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

index 74a54a2b814b96c88ba540c61bb962036105922e..99c454dc5ad83fd1c80acb3362b855f470065426 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -31,11 +31,14 @@ impl Config {
          Ok(())
      }
  }
          Ok(())
      }
  }
-
-const DEFAULT_CONFIG: Config = Config {
-    column_threshold: 2,
-    static_columns: vec![],
-};
+impl Default for Config {
+    fn default() -> Self {
+        Self {
+            column_threshold: 2,
+            static_columns: vec![],
+        }
+    }
+}
  
  const HEADER: &str = r#"<!DOCTYPE html>
  <html>
  
  const HEADER: &str = r#"<!DOCTYPE html>
  <html>
@@ -213,7 +216,7 @@ impl<'cfg, Input: Iterator<Item = Result<String, std::io::Error>>> Iterator
  }
  
  fn read_input(input: impl std::io::Read) -> Result<(Vec<Rowlike>, Config), std::io::Error> {
  }
  
  fn read_input(input: impl std::io::Read) -> Result<(Vec<Rowlike>, Config), std::io::Error> {
-    let mut config = DEFAULT_CONFIG;
+    let mut config = Config::default();
      let reader = Reader::new(&mut config, std::io::BufReader::new(input).lines());
      reader
          .collect::<Result<Vec<_>, _>>()
      let reader = Reader::new(&mut config, std::io::BufReader::new(input).lines());
      reader
          .collect::<Result<Vec<_>, _>>()
@@ -305,7 +308,7 @@ fn render_leftover(notcol: &str, instances: &[Option<String>]) -> HTML {
      }
  }
  
      }
  }
  
-fn render_all_leftovers(row: &Row) -> HTML {
+fn render_all_leftovers(config: &Config, row: &Row) -> HTML {
      let mut order: Vec<_> = row.entries.keys().collect();
      order.sort_unstable();
      HTML(
      let mut order: Vec<_> = row.entries.keys().collect();
      order.sort_unstable();
      HTML(
@@ -335,7 +338,7 @@ fn render_row(config: &Config, columns: &[String], rowlike: &mut Rowlike) -> HTM
                  .iter()
                  .map(|col| render_cell(col, row))
                  .collect::<HTML>();
                  .iter()
                  .map(|col| render_cell(col, row))
                  .collect::<HTML>();
-            let leftovers = render_all_leftovers(row);
+            let leftovers = render_all_leftovers(config, row);
              HTML(format!(
                  "<tr><th id=\"{row_label}\">{row_label}</th>{static_cells}{dynamic_cells}<td class=\"leftover\" onmouseover=\"highlight('{row_label}')\" onmouseout=\"clear_highlight('{row_label}')\">{leftovers}</td></tr>\n"
              ))
              HTML(format!(
                  "<tr><th id=\"{row_label}\">{row_label}</th>{static_cells}{dynamic_cells}<td class=\"leftover\" onmouseover=\"highlight('{row_label}')\" onmouseout=\"clear_highlight('{row_label}')\">{leftovers}</td></tr>\n"
              ))
@@ -692,30 +695,39 @@ mod tests {
      #[test]
      fn test_render_leftovers() {
          assert_eq!(
      #[test]
      fn test_render_leftovers() {
          assert_eq!(
-            render_all_leftovers(&Row {
-                label: "nope".to_owned(),
-                entries: HashMap::from([("foo".to_owned(), vec![None])]),
-            }),
+            render_all_leftovers(
+                &Config::default(),
+                &Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([("foo".to_owned(), vec![None])]),
+                }
+            ),
              HTML::from("foo")
          );
          assert_eq!(
              HTML::from("foo")
          );
          assert_eq!(
-            render_all_leftovers(&Row {
-                label: "nope".to_owned(),
-                entries: HashMap::from([
-                    ("foo".to_owned(), vec![None]),
-                    ("bar".to_owned(), vec![None])
-                ]),
-            }),
+            render_all_leftovers(
+                &Config::default(),
+                &Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([
+                        ("foo".to_owned(), vec![None]),
+                        ("bar".to_owned(), vec![None])
+                    ]),
+                }
+            ),
              HTML::from("bar, foo")
          );
          assert_eq!(
              HTML::from("bar, foo")
          );
          assert_eq!(
-            render_all_leftovers(&Row {
-                label: "nope".to_owned(),
-                entries: HashMap::from([
-                    ("foo".to_owned(), vec![None]),
-                    ("bar".to_owned(), vec![None, None])
-                ]),
-            }),
+            render_all_leftovers(
+                &Config::default(),
+                &Row {
+                    label: "nope".to_owned(),
+                    entries: HashMap::from([
+                        ("foo".to_owned(), vec![None]),
+                        ("bar".to_owned(), vec![None, None])
+                    ]),
+                }
+            ),
              HTML::from("bar: 2, foo")
          );
      }
              HTML::from("bar: 2, foo")
          );
      }
@@ -724,7 +736,7 @@ mod tests {
      fn test_render_row() {
          assert_eq!(
              render_row(
      fn test_render_row() {
          assert_eq!(
              render_row(
-                &DEFAULT_CONFIG,
+                &Config::default(),
                  &["foo".to_owned()],
                  &mut Rowlike::Row(Row {
                      label: "nope".to_owned(),
                  &["foo".to_owned()],
                  &mut Rowlike::Row(Row {
                      label: "nope".to_owned(),