Convert all functions to using the wrapped input type.

src/parser/diary_sexp.rs

@@ -6,6 +6,7 @@ use nom::combinator::eof;
 use nom::combinator::recognize;
 use nom::sequence::tuple;
 
+use super::org_source::OrgSource;
 use super::sexp::sexp;
 use super::Context;
 use crate::error::Res;
@@ -14,7 +15,10 @@ use crate::parser::util::start_of_line;
 use crate::parser::DiarySexp;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn diary_sexp<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, DiarySexp<'s>> {
+pub fn diary_sexp<'r, 's>(
+    context: Context<'r, 's>,
+    input: OrgSource<'s>,
+) -> Res<OrgSource<'s>, DiarySexp<'s>> {
     start_of_line(context, input)?;
     let (remaining, _leading_whitespace) = space0(input)?;
     let (remaining, _clock) = tag("%%")(remaining)?;
@@ -24,5 +28,10 @@ pub fn diary_sexp<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s s
         recognize(tuple((space0, alt((line_ending, eof)))))(remaining)?;
 
     let source = get_consumed(input, remaining);
-    Ok((remaining, DiarySexp { source }))
+    Ok((
+        remaining,
+        DiarySexp {
+            source: source.into(),
+        },
+    ))
 }