chore: introduce RenderOutput trait

Author: dpc

bench/input/build.rs

@@ -6,7 +6,7 @@ fn main() -> std::io::Result<()> {
             let entry = entry.ok()?;
             if let Some(name) = entry.file_name().to_str() {
                 if let Some(name) = name.strip_suffix(".dj") {
-                    if entry.file_type().map_or(false, |ty| !ty.is_dir()) {
+                    if entry.file_type().is_ok_and(|ty| !ty.is_dir()) {
                         let input = std::fs::read_to_string(
                             std::path::Path::new(".").join(entry.file_name()),
                         )

src/html.rs

@@ -9,6 +9,7 @@ use crate::ListKind;
 use crate::Map;
 use crate::OrderedListNumbering::*;
 use crate::Render;
+use crate::RenderOutput;
 use crate::SpanLinkType;
 
 /// Render events into a string.
@@ -373,6 +374,17 @@ where
     }
 }
 
+impl<'s, W> RenderOutput<'s> for Renderer<'s, W>
+where
+    W: std::fmt::Write,
+{
+    type Output = W;
+
+    fn into_output(self) -> Self::Output {
+        self.output
+    }
+}
+
 impl<'s, W> Render<'s> for Renderer<'s, WriteAdapter<W>>
 where
     W: std::io::Write,

src/lib.rs

@@ -74,6 +74,7 @@ pub trait Render<'s> {
     fn finish(&mut self) -> Result<(), Self::Error>;
 }
 
+/// Utility extensions method for [`Render`] trait
 pub trait RenderExt<'s>: Render<'s> {
     /// Parse and render the whole document with `renderer`
     fn render_document(&mut self, src: &'s str) -> Result<(), Self::Error> {
@@ -97,6 +98,28 @@ pub trait RenderExt<'s>: Render<'s> {
 
 impl<'s, R> RenderExt<'s> for R where R: Render<'s> {}
 
+/// A `Render` that produces an output
+pub trait RenderOutput<'s>: Render<'s> {
+    type Output;
+    fn into_output(self) -> Self::Output;
+}
+
+/// Utility extension method for [`RenderOutput`] trait
+pub trait RenderOutputExt<'s>: RenderOutput<'s> {
+    fn render_into_document(
+        mut self,
+        input: &'s str,
+    ) -> Result<Self::Output, <Self as Render<'s>>::Error>
+    where
+        Self: Sized,
+    {
+        RenderExt::<'s>::render_document(&mut self, input)?;
+        Ok(self.into_output())
+    }
+}
+
+impl<'s, R> RenderOutputExt<'s> for R where R: RenderOutput<'s> {}
+
 /// A Djot event.
 ///
 /// A Djot document is represented by a sequence of events. An element may consist of one or

tests/afl/Cargo.lock

@@ -5,7 +5,7 @@ edition = "2021"
 default-run = "main"
 
 [dependencies]
-afl = "0.11"
+afl = "0.17"
 jotdown = { path = "../../", features = ["deterministic"] }
 html5ever = "0.26"
 

tests/afl/Cargo.toml

@@ -1,4 +1,4 @@
-use jotdown::{Container, Event, Render, RenderExt as _};
+use jotdown::{Container, Event, Render, RenderExt as _, RenderOutput};
 use std::borrow::Cow;
 
 struct RickrollRenderer<R>(R);
@@ -31,6 +31,17 @@ where
     }
 }
 
+impl<'s, R> RenderOutput<'s> for RickrollRenderer<R>
+where
+    R: RenderOutput<'s>,
+{
+    type Output = R::Output;
+
+    fn into_output(self) -> Self::Output {
+        self.0.into_output()
+    }
+}
+
 #[test]
 fn rickroll_me() {
     use jotdown::RenderOutputExt;
@@ -40,7 +51,7 @@ fn rickroll_me() {
         .unwrap();
 
     assert_eq!(
-        r.0.into_inner(),
+        out,
         "<p><a href=\"https://www.youtube.com/watch?v=E4WlUXrJgy4\">interesting link</a></p>"
     );
 }

tests/filters.rs

@@ -1,9 +1,9 @@
 fn main() {
     let has_dj = std::fs::read_dir(".").unwrap().any(|e| {
-        e.map_or(false, |e| {
+        e.is_ok_and(|e| {
             e.path()
                 .extension()
-                .map_or(false, |ext| ext.to_str() == Some("dj"))
+                .is_some_and(|ext| ext.to_str() == Some("dj"))
         })
     });
     if has_dj {