Address pedantic issues

[rbdr/page] / src / html_renderer.rs

diff --git a/src/html_renderer.rs b/src/html_renderer.rs
index 1b26bff79d856a36015c468d757592195639a037..77241317ac4ab18dbb4e21b77b90e2e151a42d25 100644 (file)
--- a/src/html_renderer.rs
+++ b/src/html_renderer.rs
@@ -1,18 +1,18 @@
 use crate::gemini_parser::GeminiLine;
 
 use crate::gemini_parser::GeminiLine;
 

-/// Renders HTML from a vector of GeminiLine elements.
+/// Renders HTML from a vector of `GeminiLine` elements.

 ///
 /// # Arguments
 ///
 /// # Arguments

-/// * `lines` - Vector of GeminiLine elements to render
+/// * `lines` - Vector of `GeminiLine` elements to render

 ///
 /// # Returns
 /// A String containing the rendered HTML.
 ///
 /// # Returns
 /// A String containing the rendered HTML.

-pub fn render_html(lines: Vec<GeminiLine>) -> String {
+pub fn render_html(lines: &[GeminiLine]) -> String {

     let mut heading_stack = Vec::new();
     let mut last_line: Option<&GeminiLine> = None;
     let mut result = String::new();
 
     let mut heading_stack = Vec::new();
     let mut last_line: Option<&GeminiLine> = None;
     let mut result = String::new();
 

-    for line in &lines {
+    for line in lines {

         result.push_str(&line_preamble(line, last_line, &mut heading_stack));
         result.push_str(&line_content(line));
         result.push('\n');
         result.push_str(&line_preamble(line, last_line, &mut heading_stack));
         result.push_str(&line_content(line));
         result.push('\n');


@@ -61,7 +61,7 @@ fn line_preamble(
                 }
             }
             heading_stack.push(*level);
                 }
             }
             heading_stack.push(*level);

-            html.push_str(&format!("<section class=\"h{}\">\n", level));
+            html.push_str(&format!("<section class=\"h{level}\">\n"));

         }
         GeminiLine::ListItem(_) => match last_line {
             Some(GeminiLine::ListItem(_)) => {}
         }
         GeminiLine::ListItem(_) => match last_line {
             Some(GeminiLine::ListItem(_)) => {}


@@ -79,15 +79,15 @@ fn line_preamble(
 
 fn line_content(line: &GeminiLine) -> String {
     match line {
 
 fn line_content(line: &GeminiLine) -> String {
     match line {

-        GeminiLine::Text(content, false) => format!("<p>{}</p>", content),
+        GeminiLine::Text(content, false) => format!("<p>{content}</p>"),

         GeminiLine::Link(url, text) => {
             let display = if text.is_empty() { url } else { text };
         GeminiLine::Link(url, text) => {
             let display = if text.is_empty() { url } else { text };

-            format!("<p class=\"a\"><a href=\"{}\">{}</a></p>", url, display)
+            format!("<p class=\"a\"><a href=\"{url}\">{display}</a></p>")

         }
         }

-        GeminiLine::Heading(level, content) => format!("<h{}>{}</h{}>", level, content, level),
-        GeminiLine::ListItem(content) => format!("<li>{}</li>", content),
+        GeminiLine::Heading(level, content) => format!("<h{level}>{content}</h{level}>"),
+        GeminiLine::ListItem(content) => format!("<li>{content}</li>"),

         GeminiLine::PreformattedToggle(true, alt_text) => {
         GeminiLine::PreformattedToggle(true, alt_text) => {

-            format!("<pre aria-label=\"{}\">", alt_text)
+            format!("<pre aria-label=\"{alt_text}\">")

         }
         GeminiLine::PreformattedToggle(false, _) => "</pre>".to_string(),
         GeminiLine::Text(content, true) | GeminiLine::Quote(content) => content.to_string(),
         }
         GeminiLine::PreformattedToggle(false, _) => "</pre>".to_string(),
         GeminiLine::Text(content, true) | GeminiLine::Quote(content) => content.to_string(),


@@ -117,7 +117,7 @@ mod tests {
     #[test]
     fn test_simple_text() {
         let input = vec![GeminiLine::Text("Hello world".to_string(), false)];
     #[test]
     fn test_simple_text() {
         let input = vec![GeminiLine::Text("Hello world".to_string(), false)];

-        assert_eq!(render_html(input), "<p>Hello world</p>\n");
+        assert_eq!(render_html(&input), "<p>Hello world</p>\n");

     }
 
     #[test]
     }
 
     #[test]


@@ -129,7 +129,7 @@ mod tests {
             GeminiLine::Heading(2, "Another Sub".to_string()),
         ];
         assert_eq!(
             GeminiLine::Heading(2, "Another Sub".to_string()),
         ];
         assert_eq!(

-            render_html(input),
+            render_html(&input),

             "<section class=\"h1\">\n\
              <h1>Top</h1>\n\
              <section class=\"h2\">\n\
             "<section class=\"h1\">\n\
              <h1>Top</h1>\n\
              <section class=\"h2\">\n\


@@ -154,7 +154,7 @@ mod tests {
             GeminiLine::ListItem("New list".to_string()),
         ];
         assert_eq!(
             GeminiLine::ListItem("New list".to_string()),
         ];
         assert_eq!(

-            render_html(input),
+            render_html(&input),

             "<ul>\n\
              <li>First</li>\n\
              <li>Second</li>\n\
             "<ul>\n\
              <li>First</li>\n\
              <li>Second</li>\n\


@@ -175,7 +175,7 @@ mod tests {
             GeminiLine::Quote("New quote".to_string()),
         ];
         assert_eq!(
             GeminiLine::Quote("New quote".to_string()),
         ];
         assert_eq!(

-            render_html(input),
+            render_html(&input),

             "<blockquote>\n\
              First quote\n\
              Still quoting\n\
             "<blockquote>\n\
              First quote\n\
              Still quoting\n\


@@ -195,7 +195,7 @@ mod tests {
             GeminiLine::PreformattedToggle(false, String::new()),
         ];
         assert_eq!(
             GeminiLine::PreformattedToggle(false, String::new()),
         ];
         assert_eq!(

-            render_html(input),
+            render_html(&input),

             "<pre aria-label=\"code\">\n\
              let x = 42;\n\
              </pre>\n"
             "<pre aria-label=\"code\">\n\
              let x = 42;\n\
              </pre>\n"


@@ -209,7 +209,7 @@ mod tests {
             GeminiLine::Link("https://rust-lang.org".to_string(), "".to_string()),
         ];
         assert_eq!(
             GeminiLine::Link("https://rust-lang.org".to_string(), "".to_string()),
         ];
         assert_eq!(

-            render_html(input),
+            render_html(&input),

             "<p class=\"a\"><a href=\"https://example.com\">Example</a></p>\n\
              <p class=\"a\"><a href=\"https://rust-lang.org\">https://rust-lang.org</a></p>\n"
         );
             "<p class=\"a\"><a href=\"https://example.com\">Example</a></p>\n\
              <p class=\"a\"><a href=\"https://rust-lang.org\">https://rust-lang.org</a></p>\n"
         );


@@ -227,7 +227,7 @@ mod tests {
             GeminiLine::Heading(2, "Another Section".to_string()),
         ];
         assert_eq!(
             GeminiLine::Heading(2, "Another Section".to_string()),
         ];
         assert_eq!(

-            render_html(input),
+            render_html(&input),

             "<section class=\"h1\">\n\
              <h1>Title</h1>\n\
              <p>Intro</p>\n\
             "<section class=\"h1\">\n\
              <h1>Title</h1>\n\
              <p>Intro</p>\n\


@@ -251,6 +251,6 @@ mod tests {
     #[test]
     fn test_empty_input() {
         let input = Vec::new();
     #[test]
     fn test_empty_input() {
         let input = Vec::new();

-        assert_eq!(render_html(input), "");
+        assert_eq!(render_html(&input), "");

     }
 }
     }
 }