Convert all functions to using the wrapped input type.

src/parser/plain_text.rs

@@ -8,6 +8,7 @@ use nom::combinator::verify;
 use nom::multi::many_till;
 
 use super::object::PlainText;
+use super::org_source::OrgSource;
 use super::radio_link::RematchObject;
 use super::Context;
 use super::Object;
@@ -17,7 +18,10 @@ use crate::parser::parser_with_context::parser_with_context;
 use crate::parser::util::exit_matcher_parser;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn plain_text<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, PlainText<'s>> {
+pub fn plain_text<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, PlainText<'s>> {
     let (remaining, source) = recognize(verify(
         many_till(
             anychar,
@@ -29,11 +33,19 @@ pub fn plain_text<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s s
         |(children, _exit_contents)| !children.is_empty(),
     ))(input)?;
 
-    Ok((remaining, PlainText { source }))
+    Ok((
+        remaining,
+        PlainText {
+            source: source.into(),
+        },
+    ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn plain_text_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn plain_text_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     recognize(parser_with_context!(any_object_except_plain_text)(context))(input)
 }
 
@@ -42,10 +54,12 @@ impl<'x> RematchObject<'x> for PlainText<'x> {
     fn rematch_object<'r, 's>(
         &'x self,
         _context: Context<'r, 's>,
-        input: &'s str,
-    ) -> Res<&'s str, Object<'s>> {
+        input: OrgSource<'s>,
+    ) -> Res<OrgSource<'s>, Object<'s>> {
         map(tag(self.source), |s| {
-            Object::PlainText(PlainText { source: s })
+            Object::PlainText(PlainText {
+                source: Into::<&str>::into(s),
+            })
         })(input)
     }
 }