From e3feb9dc125d96673d3947c925dd7f1986e16416 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Fri, 4 Oct 2024 13:50:14 -0700 Subject: [PATCH 1/1] =?utf8?q?Rename=20column=5Fheader=5Forder=20=E2=86=92?= =?utf8?q?=20column=5Fheader=5Flabels?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/lib.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index b4b8bbc..88c6d8c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -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> { @@ -373,7 +373,7 @@ fn column_header_order<'a>( fn render_column_headers(config: &Config, columns: &[String]) -> HTML { HTML( String::from(r#""#) - + &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] -- 2.44.1