From: Scott Worley Date: Thu, 12 Sep 2024 06:12:28 +0000 (-0700) Subject: Use raw strings so strings with " in them are easier to read X-Git-Tag: v0.3.0~14 X-Git-Url: http://git.scottworley.com/tablify/commitdiff_plain/5ffe8e3a8394fc46b50659b0e197b0b0a22e18c8?ds=sidebyside Use raw strings so strings with " in them are easier to read --- diff --git a/src/lib.rs b/src/lib.rs index c5761d8..cfaeb4b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -6,11 +6,11 @@ use std::iter::Iterator; pub struct Config {} -const HEADER: &str = " +const HEADER: &str = r#" - - + + @@ -35,7 +35,7 @@ const HEADER: &str = " -"; +"#; const FOOTER: &str = "

@@ -219,7 +219,9 @@ fn render_cell(col: &str, row: &mut Row) -> HTML { ) }; row.entries.remove(col); - HTML(format!("{contents}")) + HTML(format!( + r#"{contents}"# + )) } fn render_row(columns: &[String], row: &mut Row) -> HTML { @@ -235,12 +237,12 @@ fn render_row(columns: &[String], row: &mut Row) -> HTML { fn render_column_headers(columns: &[String]) -> HTML { HTML( - String::from("") + String::from(r#""#) + &columns.iter().fold(String::new(), |mut acc, col| { let col_header = HTML::escape(col.as_ref()); write!( &mut acc, - "

{col_header}

" + r#"

{col_header}

"# ) .unwrap(); acc @@ -443,7 +445,9 @@ mod tests { entries: HashMap::new(), } ), - HTML::from("") + HTML::from( + r#""# + ) ); assert_eq!( render_cell( @@ -453,7 +457,9 @@ mod tests { entries: HashMap::from([("bar".to_owned(), vec![None])]), } ), - HTML::from("") + HTML::from( + r#""# + ) ); assert_eq!( render_cell( @@ -463,7 +469,9 @@ mod tests { entries: HashMap::from([("foo".to_owned(), vec![None])]), } ), - HTML::from("") + HTML::from( + r#""# + ) ); assert_eq!( render_cell( @@ -473,17 +481,24 @@ mod tests { entries: HashMap::from([("foo".to_owned(), vec![None, None])]), } ), - HTML::from("2") + HTML::from( + r#"2"# + ) ); assert_eq!( render_cell( "foo", &mut Row { label: "nope".to_owned(), - entries: HashMap::from([("foo".to_owned(), vec![Some("5".to_owned()), Some("10".to_owned())])]), + entries: HashMap::from([( + "foo".to_owned(), + vec![Some("5".to_owned()), Some("10".to_owned())] + )]), } ), - HTML::from("5 10") + HTML::from( + r#"5 10"# + ) ); assert_eq!( render_cell( @@ -493,7 +508,9 @@ mod tests { entries: HashMap::from([("foo".to_owned(), vec![Some("5".to_owned()), None])]), } ), - HTML::from("5 â") + HTML::from( + r#"5 â"# + ) ); assert_eq!( render_cell( @@ -503,7 +520,9 @@ mod tests { entries: HashMap::from([("heart".to_owned(), vec![Some("<3".to_owned())])]), } ), - HTML::from("<3") + HTML::from( + r#"<3"# + ) ); assert_eq!( render_cell( @@ -513,7 +532,9 @@ mod tests { entries: HashMap::from([("foo".to_owned(), vec![None])]), } ), - HTML::from("") + HTML::from( + r#""# + ) ); let mut r = Row { label: "nope".to_owned(),