From 17b166867f51a4be80a886caf10cba1776db7372 Mon Sep 17 00:00:00 2001
From: Noah Hellman <noah@hllmn.net>
Date: Tue, 11 Apr 2023 20:02:08 +0200
Subject: [PATCH] html: derive Renderer::default

setting defaults manually mostly causes rebase conflicts
---
 src/html.rs | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/html.rs b/src/html.rs
index 2dfd22a..be4b57f 100644
--- a/src/html.rs
+++ b/src/html.rs
@@ -15,30 +15,23 @@ enum Raw {
     Other,
 }
 
+impl Default for Raw {
+    fn default() -> Self {
+        Self::None
+    }
+}
+
+#[derive(Default)]
 pub struct Renderer {
     raw: Raw,
     img_alt_text: usize,
     list_tightness: Vec<bool>,
     encountered_footnote: bool,
     footnote_number: Option<std::num::NonZeroUsize>,
-    first_line: bool,
+    not_first_line: bool,
     close_para: bool,
 }
 
-impl Default for Renderer {
-    fn default() -> Self {
-        Self {
-            raw: Raw::None,
-            img_alt_text: 0,
-            list_tightness: Vec::new(),
-            encountered_footnote: false,
-            footnote_number: None,
-            first_line: true,
-            close_para: false,
-        }
-    }
-}
-
 impl Render for Renderer {
     fn render_event<'s, W>(&mut self, e: &Event<'s>, mut out: W) -> std::fmt::Result
     where
@@ -59,7 +52,7 @@ impl Render for Renderer {
 
         match e {
             Event::Start(c, attrs) => {
-                if c.is_block() && !self.first_line {
+                if c.is_block() && self.not_first_line {
                     out.write_char('\n')?;
                 }
                 if self.img_alt_text > 0 && !matches!(c, Container::Image(..)) {
@@ -389,7 +382,7 @@ impl Render for Renderer {
                 out.write_str(">")?;
             }
         }
-        self.first_line = false;
+        self.not_first_line = true;
 
         Ok(())
     }