Convert all functions to using the wrapped input type.

src/parser/keyword.rs

@@ -11,13 +11,17 @@ use nom::combinator::peek;
 use nom::combinator::recognize;
 use nom::sequence::tuple;
 
+use super::org_source::OrgSource;
 use super::Context;
 use crate::error::Res;
 use crate::parser::util::start_of_line;
 use crate::parser::Keyword;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn keyword<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, Keyword<'s>> {
+pub fn keyword<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, Keyword<'s>> {
     start_of_line(context, input)?;
     // TODO: When key is a member of org-element-parsed-keywords, value can contain the standard set objects, excluding footnote references.
     let (remaining, rule) = recognize(tuple((
@@ -30,5 +34,10 @@ pub fn keyword<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str,
         alt((recognize(tuple((space1, is_not("\r\n")))), space0)),
         alt((line_ending, eof)),
     )))(input)?;
-    Ok((remaining, Keyword { source: rule }))
+    Ok((
+        remaining,
+        Keyword {
+            source: rule.into(),
+        },
+    ))
 }