]> git.scottworley.com Git - tablify/commitdiff
Rename column_header_order → column_header_labels
authorScott Worley <scottworley@scottworley.com>
Fri, 4 Oct 2024 20:50:14 +0000 (13:50 -0700)
committerScott Worley <scottworley@scottworley.com>
Fri, 4 Oct 2024 21:22:30 +0000 (14:22 -0700)
src/lib.rs

index b4b8bbcc44ed515aec293148aa020f6bb584175f..88c6d8c16f0c082b0d14ba111a90b9aad937b083 100644 (file)
@@ -359,7 +359,7 @@ fn render_row(config: &Config, columns: &[String], rowlike: &mut Rowlike) -> HTM
     }
 }
 
-fn column_header_order<'a>(
+fn column_header_labels<'a>(
     config: &'a Config,
     columns: &'a [String],
 ) -> impl Iterator<Item = Option<&'a String>> {
@@ -373,7 +373,7 @@ fn column_header_order<'a>(
 fn render_column_headers(config: &Config, columns: &[String]) -> HTML {
     HTML(
         String::from(r#"<tr class="key"><th></th>"#)
-            + &column_header_order(config, columns).fold(String::new(), |mut acc, ocol| {
+            + &column_header_labels(config, columns).fold(String::new(), |mut acc, ocol| {
                 match ocol {
                     Some(col) => {
                         let col_header = HTML::escape(col);
@@ -596,27 +596,27 @@ mod tests {
     }
 
     #[test]
-    fn test_column_header_order() {
+    fn test_column_header_labels() {
         let mut cfg = Config::default();
 
-        assert!(column_header_order(&cfg, &["foo".to_owned()]).eq([Some(&"foo".to_owned())]));
+        assert!(column_header_labels(&cfg, &["foo".to_owned()]).eq([Some(&"foo".to_owned())]));
 
         cfg.static_columns.push(Some("bar".to_owned()));
-        assert!(column_header_order(&cfg, &["foo".to_owned()])
+        assert!(column_header_labels(&cfg, &["foo".to_owned()])
             .eq([Some(&"bar".to_owned()), Some(&"foo".to_owned())]));
 
         cfg.static_columns.push(None);
-        assert!(column_header_order(&cfg, &["foo".to_owned()]).eq([
+        assert!(column_header_labels(&cfg, &["foo".to_owned()]).eq([
             Some(&"bar".to_owned()),
             None,
             Some(&"foo".to_owned())
         ]));
 
         cfg.hidden_columns.insert("foo".to_owned());
-        assert!(column_header_order(&cfg, &["foo".to_owned()]).eq([Some(&"bar".to_owned()), None]));
+        assert!(column_header_labels(&cfg, &["foo".to_owned()]).eq([Some(&"bar".to_owned()), None]));
 
         cfg.hidden_columns.insert("bar".to_owned());
-        assert!(column_header_order(&cfg, &["foo".to_owned()]).eq([None]));
+        assert!(column_header_labels(&cfg, &["foo".to_owned()]).eq([None]));
     }
 
     #[test]