refactor(parser): Switch to ModalParser

Author: epage

crates/toml_edit/src/parser/document.rs

@@ -30,7 +30,7 @@ use crate::RawString;
 //                  ws )
 pub(crate) fn document<'s, 'i>(
     state_ref: &'s RefCell<ParseState>,
-) -> impl Parser<Input<'i>, (), ContextError> + 's {
+) -> impl ModalParser<Input<'i>, (), ContextError> + 's {
     move |i: &mut Input<'i>| {
         (
             // Remove BOM if present
@@ -54,7 +54,7 @@ pub(crate) fn document<'s, 'i>(
 
 pub(crate) fn parse_comment<'s, 'i>(
     state: &'s RefCell<ParseState>,
-) -> impl Parser<Input<'i>, (), ContextError> + 's {
+) -> impl ModalParser<Input<'i>, (), ContextError> + 's {
     move |i: &mut Input<'i>| {
         (comment, line_ending)
             .span()
@@ -67,7 +67,7 @@ pub(crate) fn parse_comment<'s, 'i>(
 
 pub(crate) fn parse_ws<'s, 'i>(
     state: &'s RefCell<ParseState>,
-) -> impl Parser<Input<'i>, (), ContextError> + 's {
+) -> impl ModalParser<Input<'i>, (), ContextError> + 's {
     move |i: &mut Input<'i>| {
         ws.span()
             .map(|span| state.borrow_mut().on_ws(span))
@@ -77,7 +77,7 @@ pub(crate) fn parse_ws<'s, 'i>(
 
 pub(crate) fn parse_newline<'s, 'i>(
     state: &'s RefCell<ParseState>,
-) -> impl Parser<Input<'i>, (), ContextError> + 's {
+) -> impl ModalParser<Input<'i>, (), ContextError> + 's {
     move |i: &mut Input<'i>| {
         newline
             .span()
@@ -88,7 +88,7 @@ pub(crate) fn parse_newline<'s, 'i>(
 
 pub(crate) fn keyval<'s, 'i>(
     state: &'s RefCell<ParseState>,
-) -> impl Parser<Input<'i>, (), ContextError> + 's {
+) -> impl ModalParser<Input<'i>, (), ContextError> + 's {
     move |i: &mut Input<'i>| {
         parse_keyval
             .try_map(|(p, kv)| state.borrow_mut().on_keyval(p, kv))

crates/toml_edit/src/parser/mod.rs

@@ -83,8 +83,9 @@ pub(crate) mod prelude {
     pub(crate) use winnow::error::FromExternalError;
     pub(crate) use winnow::error::StrContext;
     pub(crate) use winnow::error::StrContextValue;
+    pub(crate) use winnow::ModalParser;
     pub(crate) use winnow::ModalResult;
-    pub(crate) use winnow::Parser;
+    pub(crate) use winnow::Parser as _;
 
     pub(crate) type Input<'b> =
         winnow::Stateful<winnow::LocatingSlice<&'b winnow::BStr>, RecursionCheck>;
@@ -135,8 +136,8 @@ pub(crate) mod prelude {
     }
 
     pub(crate) fn check_recursion<'b, O>(
-        mut parser: impl Parser<Input<'b>, O, ContextError>,
-    ) -> impl Parser<Input<'b>, O, ContextError> {
+        mut parser: impl ModalParser<Input<'b>, O, ContextError>,
+    ) -> impl ModalParser<Input<'b>, O, ContextError> {
         move |input: &mut Input<'b>| {
             input.state.enter().map_err(|err| {
                 #[allow(deprecated)]

crates/toml_edit/src/parser/strings.rs

@@ -212,8 +212,8 @@ fn mlb_content<'i>(input: &mut Input<'i>) -> ModalResult<Cow<'i, str>> {
 
 // mlb-quotes = 1*2quotation-mark
 fn mlb_quotes<'i>(
-    mut term: impl Parser<Input<'i>, (), ContextError>,
-) -> impl Parser<Input<'i>, &'i str, ContextError> {
+    mut term: impl ModalParser<Input<'i>, (), ContextError>,
+) -> impl ModalParser<Input<'i>, &'i str, ContextError> {
     move |input: &mut Input<'i>| {
         let start = input.checkpoint();
         let res = terminated(b"\"\"", peek(term.by_ref()))
@@ -341,8 +341,8 @@ const MLL_CHAR: (
 
 // mll-quotes = 1*2apostrophe
 fn mll_quotes<'i>(
-    mut term: impl Parser<Input<'i>, (), ContextError>,
-) -> impl Parser<Input<'i>, &'i str, ContextError> {
+    mut term: impl ModalParser<Input<'i>, (), ContextError>,
+) -> impl ModalParser<Input<'i>, &'i str, ContextError> {
     move |input: &mut Input<'i>| {
         let start = input.checkpoint();
         let res = terminated(b"''", peek(term.by_ref()))

crates/toml_edit/src/parser/table.rs

@@ -27,7 +27,7 @@ const ARRAY_TABLE_CLOSE: &[u8] = b"]]";
 // std-table = std-table-open key *( table-key-sep key) std-table-close
 pub(crate) fn std_table<'s, 'i>(
     state: &'s RefCell<ParseState>,
-) -> impl Parser<Input<'i>, (), ContextError> + 's {
+) -> impl ModalParser<Input<'i>, (), ContextError> + 's {
     move |i: &mut Input<'i>| {
         (
             delimited(
@@ -52,7 +52,7 @@ pub(crate) fn std_table<'s, 'i>(
 // array-table = array-table-open key *( table-key-sep key) array-table-close
 pub(crate) fn array_table<'s, 'i>(
     state: &'s RefCell<ParseState>,
-) -> impl Parser<Input<'i>, (), ContextError> + 's {
+) -> impl ModalParser<Input<'i>, (), ContextError> + 's {
     move |i: &mut Input<'i>| {
         (
             delimited(
@@ -77,7 +77,7 @@ pub(crate) fn array_table<'s, 'i>(
 // table = std-table / array-table
 pub(crate) fn table<'s, 'i>(
     state: &'s RefCell<ParseState>,
-) -> impl Parser<Input<'i>, (), ContextError> + 's {
+) -> impl ModalParser<Input<'i>, (), ContextError> + 's {
     move |i: &mut Input<'i>| {
         dispatch!(peek::<_, &[u8],_,_>(take(2usize));
             b"[[" => array_table(state),