Give global options their own lifetime.

src/parser/plain_list.rs

@@ -22,6 +22,7 @@ use super::org_source::OrgSource;
 use super::util::non_whitespace_character;
 use crate::context::parser_with_context;
 use crate::context::ContextElement;
+use crate::context::ContextMatcher;
 use crate::context::ExitClass;
 use crate::context::ExitMatcherNode;
 use crate::context::RefContext;
@@ -60,8 +61,8 @@ pub fn detect_plain_list<'s>(input: OrgSource<'s>) -> Res<OrgSource<'s>, ()> {
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn plain_list<'r, 's>(
-    context: RefContext<'_, 'r, 's>,
+pub fn plain_list<'b, 'g, 'r, 's>(
+    context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, PlainList<'s>> {
     let contexts = [
@@ -134,8 +135,8 @@ pub fn plain_list<'r, 's>(
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-pub fn plain_list_item<'r, 's>(
-    context: RefContext<'_, 'r, 's>,
+pub fn plain_list_item<'b, 'g, 'r, 's>(
+    context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, PlainListItem<'s>> {
     start_of_line(input)?;
@@ -248,8 +249,8 @@ fn counter<'s>(i: OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn plain_list_end<'r, 's>(
-    _context: RefContext<'_, 'r, 's>,
+fn plain_list_end<'b, 'g, 'r, 's>(
+    _context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, OrgSource<'s>> {
     recognize(tuple((
@@ -260,10 +261,7 @@ fn plain_list_end<'r, 's>(
     )))(input)
 }
 
-const fn plain_list_item_end(
-    indent_level: usize,
-) -> impl for<'b, 'r, 's> Fn(RefContext<'b, 'r, 's>, OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>>
-{
+const fn plain_list_item_end(indent_level: usize) -> impl ContextMatcher {
     let line_indented_lte_matcher = line_indented_lte(indent_level);
     move |context, input: OrgSource<'_>| {
         _plain_list_item_end(context, input, &line_indented_lte_matcher)
@@ -274,13 +272,10 @@ const fn plain_list_item_end(
     feature = "tracing",
     tracing::instrument(ret, level = "debug", skip(line_indented_lte_matcher))
 )]
-fn _plain_list_item_end<'r, 's>(
-    context: RefContext<'_, 'r, 's>,
+fn _plain_list_item_end<'b, 'g, 'r, 's>(
+    context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
-    line_indented_lte_matcher: impl for<'bb, 'rr, 'ss> Fn(
-        RefContext<'bb, 'rr, 'ss>,
-        OrgSource<'ss>,
-    ) -> Res<OrgSource<'ss>, OrgSource<'ss>>,
+    line_indented_lte_matcher: impl ContextMatcher,
 ) -> Res<OrgSource<'s>, OrgSource<'s>> {
     start_of_line(input)?;
     recognize(tuple((
@@ -289,16 +284,13 @@ fn _plain_list_item_end<'r, 's>(
     )))(input)
 }
 
-const fn line_indented_lte(
-    indent_level: usize,
-) -> impl for<'b, 'r, 's> Fn(RefContext<'b, 'r, 's>, OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>>
-{
+const fn line_indented_lte(indent_level: usize) -> impl ContextMatcher {
     move |context, input: OrgSource<'_>| _line_indented_lte(context, input, indent_level)
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn _line_indented_lte<'r, 's>(
-    _context: RefContext<'_, 'r, 's>,
+fn _line_indented_lte<'b, 'g, 'r, 's>(
+    _context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
     indent_level: usize,
 ) -> Res<OrgSource<'s>, OrgSource<'s>> {
@@ -312,8 +304,8 @@ fn _line_indented_lte<'r, 's>(
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn item_tag<'r, 's>(
-    context: RefContext<'_, 'r, 's>,
+fn item_tag<'b, 'g, 'r, 's>(
+    context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, Vec<Object<'s>>> {
     let parser_context = ContextElement::ExitMatcherNode(ExitMatcherNode {
@@ -333,8 +325,8 @@ fn item_tag<'r, 's>(
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn item_tag_end<'r, 's>(
-    _context: RefContext<'_, 'r, 's>,
+fn item_tag_end<'b, 'g, 'r, 's>(
+    _context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, OrgSource<'s>> {
     recognize(alt((
@@ -345,8 +337,8 @@ fn item_tag_end<'r, 's>(
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
-fn item_tag_post_gap<'r, 's>(
-    context: RefContext<'_, 'r, 's>,
+fn item_tag_post_gap<'b, 'g, 'r, 's>(
+    context: RefContext<'b, 'g, 'r, 's>,
     input: OrgSource<'s>,
 ) -> Res<OrgSource<'s>, OrgSource<'s>> {
     verify(