Revert "lib: add Render::render_{event, prologue, epilogue}"
This reverts commit e8503e28fd.
This imposed too many limitations on the renderer implementation. E.g.
making it impossible to store `Event<'s>`'s in the renderer struct.
Revert back to having the renderer struct separate from the implementor
of the Render trait. The implementor may instead create a renderer
struct without any restrictions.
This commit is contained in:
parent
8e48021f7a
commit
c4ecd0c677
3 changed files with 38 additions and 54 deletions
30
src/html.rs
30
src/html.rs
|
|
@ -9,6 +9,32 @@ use crate::OrderedListNumbering::*;
|
|||
use crate::Render;
|
||||
use crate::SpanLinkType;
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct Renderer {}
|
||||
|
||||
impl Render for Renderer {
|
||||
fn push<'s, I, W>(&self, mut events: I, mut out: W) -> std::fmt::Result
|
||||
where
|
||||
I: Iterator<Item = Event<'s>>,
|
||||
W: std::fmt::Write,
|
||||
{
|
||||
let mut w = Writer::default();
|
||||
events.try_for_each(|e| w.render_event(&e, &mut out))?;
|
||||
w.render_epilogue(&mut out)
|
||||
}
|
||||
|
||||
fn push_borrowed<'s, E, I, W>(&self, mut events: I, mut out: W) -> std::fmt::Result
|
||||
where
|
||||
E: AsRef<Event<'s>>,
|
||||
I: Iterator<Item = E>,
|
||||
W: std::fmt::Write,
|
||||
{
|
||||
let mut w = Writer::default();
|
||||
events.try_for_each(|e| w.render_event(e.as_ref(), &mut out))?;
|
||||
w.render_epilogue(&mut out)
|
||||
}
|
||||
}
|
||||
|
||||
enum Raw {
|
||||
None,
|
||||
Html,
|
||||
|
|
@ -22,7 +48,7 @@ impl Default for Raw {
|
|||
}
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct Renderer {
|
||||
struct Writer {
|
||||
raw: Raw,
|
||||
img_alt_text: usize,
|
||||
list_tightness: Vec<bool>,
|
||||
|
|
@ -33,7 +59,7 @@ pub struct Renderer {
|
|||
ignore: bool,
|
||||
}
|
||||
|
||||
impl Render for Renderer {
|
||||
impl Writer {
|
||||
fn render_event<'s, W>(&mut self, e: &Event<'s>, mut out: W) -> std::fmt::Result
|
||||
where
|
||||
W: std::fmt::Write,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue