html: derive Renderer::default
setting defaults manually mostly causes rebase conflicts
This commit is contained in:
		
					parent
					
						
							
								1b90ba9423
							
						
					
				
			
			
				commit
				
					
						17b166867f
					
				
			
		
					 1 changed files with 10 additions and 17 deletions
				
			
		
							
								
								
									
										27
									
								
								src/html.rs
									
										
									
									
									
								
							
							
						
						
									
										27
									
								
								src/html.rs
									
										
									
									
									
								
							| 
						 | 
					@ -15,30 +15,23 @@ enum Raw {
 | 
				
			||||||
    Other,
 | 
					    Other,
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					impl Default for Raw {
 | 
				
			||||||
 | 
					    fn default() -> Self {
 | 
				
			||||||
 | 
					        Self::None
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#[derive(Default)]
 | 
				
			||||||
pub struct Renderer {
 | 
					pub struct Renderer {
 | 
				
			||||||
    raw: Raw,
 | 
					    raw: Raw,
 | 
				
			||||||
    img_alt_text: usize,
 | 
					    img_alt_text: usize,
 | 
				
			||||||
    list_tightness: Vec<bool>,
 | 
					    list_tightness: Vec<bool>,
 | 
				
			||||||
    encountered_footnote: bool,
 | 
					    encountered_footnote: bool,
 | 
				
			||||||
    footnote_number: Option<std::num::NonZeroUsize>,
 | 
					    footnote_number: Option<std::num::NonZeroUsize>,
 | 
				
			||||||
    first_line: bool,
 | 
					    not_first_line: bool,
 | 
				
			||||||
    close_para: 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 {
 | 
					impl Render for Renderer {
 | 
				
			||||||
    fn render_event<'s, W>(&mut self, e: &Event<'s>, mut out: W) -> std::fmt::Result
 | 
					    fn render_event<'s, W>(&mut self, e: &Event<'s>, mut out: W) -> std::fmt::Result
 | 
				
			||||||
    where
 | 
					    where
 | 
				
			||||||
| 
						 | 
					@ -59,7 +52,7 @@ impl Render for Renderer {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        match e {
 | 
					        match e {
 | 
				
			||||||
            Event::Start(c, attrs) => {
 | 
					            Event::Start(c, attrs) => {
 | 
				
			||||||
                if c.is_block() && !self.first_line {
 | 
					                if c.is_block() && self.not_first_line {
 | 
				
			||||||
                    out.write_char('\n')?;
 | 
					                    out.write_char('\n')?;
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                if self.img_alt_text > 0 && !matches!(c, Container::Image(..)) {
 | 
					                if self.img_alt_text > 0 && !matches!(c, Container::Image(..)) {
 | 
				
			||||||
| 
						 | 
					@ -389,7 +382,7 @@ impl Render for Renderer {
 | 
				
			||||||
                out.write_str(">")?;
 | 
					                out.write_str(">")?;
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        self.first_line = false;
 | 
					        self.not_first_line = true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        Ok(())
 | 
					        Ok(())
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue