Convert all functions to using the wrapped input type.

src/parser/greater_block.rs

@@ -11,6 +11,7 @@ use nom::combinator::verify;
 use nom::multi::many_till;
 use nom::sequence::tuple;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::CustomError;
 use crate::error::MyError;
@@ -33,26 +34,28 @@ use crate::parser::Paragraph;
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn greater_block<'r, 's>(
     context: Context<'r, 's>,
-    input: &'s str,
-) -> Res<&'s str, GreaterBlock<'s>> {
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, GreaterBlock<'s>> {
     // TODO: Do I need to differentiate between different greater block types.
     start_of_line(context, input)?;
     let (remaining, _leading_whitespace) = space0(input)?;
     let (remaining, (_begin, name)) = tuple((
         tag_no_case("#+begin_"),
-        verify(name, |name: &str| match name.to_lowercase().as_str() {
-            "comment" | "example" | "export" | "src" | "verse" => false,
-            _ => true,
+        verify(name, |name: &OrgSource<'_>| {
+            match Into::<&str>::into(name).to_lowercase().as_str() {
+                "comment" | "example" | "export" | "src" | "verse" => false,
+                _ => true,
+            }
         }),
     ))(remaining)?;
-    let context_name = match name.to_lowercase().as_str() {
+    let context_name = match Into::<&str>::into(name).to_lowercase().as_str() {
         "center" => "center block",
         "quote" => "quote block",
         _ => "greater block",
     };
     if immediate_in_section(context, context_name) {
         return Err(nom::Err::Error(CustomError::MyError(MyError(
-            "Cannot nest objects of the same element",
+            "Cannot nest objects of the same element".into(),
         ))));
     }
     let (remaining, parameters) = opt(tuple((space1, parameters)))(remaining)?;
@@ -60,7 +63,7 @@ pub fn greater_block<'r, 's>(
     let parser_context = context
         .with_additional_node(ContextElement::ConsumeTrailingWhitespace(true))
         .with_additional_node(ContextElement::Context(context_name))
-        .with_additional_node(ContextElement::GreaterBlock(name))
+        .with_additional_node(ContextElement::GreaterBlock(name.into()))
         .with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
             class: ExitClass::Alpha,
             exit_matcher: &greater_block_end,
@@ -80,9 +83,9 @@ pub fn greater_block<'r, 's>(
     ))(remaining)
     {
         Ok((remain, (_not_immediate_exit, first_line, (_trailing_whitespace, _exit_contents)))) => {
-            let mut element = Element::Paragraph(Paragraph::of_text(first_line));
+            let mut element = Element::Paragraph(Paragraph::of_text(first_line.into()));
             let source = get_consumed(remaining, remain);
-            element.set_source(source);
+            element.set_source(source.into());
             (remain, vec![element])
         }
         Err(_) => {
@@ -99,29 +102,32 @@ pub fn greater_block<'r, 's>(
     Ok((
         remaining,
         GreaterBlock {
-            source,
-            name,
-            parameters,
+            source: source.into(),
+            name: name.into(),
+            parameters: parameters.map(|val| Into::<&str>::into(val)),
             children,
         },
     ))
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn name<'s>(input: &'s str) -> Res<&'s str, &'s str> {
+fn name<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     is_not(" \t\r\n")(input)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn parameters<'s>(input: &'s str) -> Res<&'s str, &'s str> {
+fn parameters<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
     is_not("\r\n")(input)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn greater_block_end<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, &'s str> {
+fn greater_block_end<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, OrgSource<'s>> {
     start_of_line(context, input)?;
     let current_name: &str = get_context_greater_block_name(context).ok_or(nom::Err::Error(
-        CustomError::MyError(MyError("Not inside a greater block")),
+        CustomError::MyError(MyError("Not inside a greater block".into())),
     ))?;
     let (remaining, _leading_whitespace) = space0(input)?;
     let (remaining, (_begin, _name, _ws)) = tuple((