Reapply "test reorder"

This reverts commit d520e47.
rust-bakery · May 5, 2024 · 95fd181 · 95fd181
1 parent d520e47
commit 95fd181
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/multi/mod.rs b/src/multi/mod.rs
@@ -398,16 +398,16 @@ where
       .parser
       .process::<OutputM<OM::Output, Check, OM::Incomplete>>(i.clone())
     {
-      Err(Err::Error(_)) => return Ok((i, res)),
-      Err(Err::Failure(e)) => return Err(Err::Failure(e)),
-      Err(Err::Incomplete(e)) => return Err(Err::Incomplete(e)),
       Ok((i1, o)) => {
         res = OM::Output::combine(res, o, |mut res, o| {
           res.push(o);
           res
         });
         i = i1;
       }
+      Err(Err::Error(_)) => return Ok((i, res)),
+      Err(Err::Failure(e)) => return Err(Err::Failure(e)),
+      Err(Err::Incomplete(e)) => return Err(Err::Incomplete(e)),
     }
 
     loop {
@@ -416,9 +416,6 @@ where
         .separator
         .process::<OutputM<Check, Check, OM::Incomplete>>(i.clone())
       {
-        Err(Err::Error(_)) => return Ok((i, res)),
-        Err(Err::Failure(e)) => return Err(Err::Failure(e)),
-        Err(Err::Incomplete(e)) => return Err(Err::Incomplete(e)),
         Ok((i1, _)) => {
           // infinite loop check: the parser must always consume
           if i1.input_len() == len {
@@ -431,18 +428,21 @@ where
             .parser
             .process::<OutputM<OM::Output, Check, OM::Incomplete>>(i1.clone())
           {
-            Err(Err::Error(_)) => return Ok((i, res)),
-            Err(Err::Failure(e)) => return Err(Err::Failure(e)),
-            Err(Err::Incomplete(e)) => return Err(Err::Incomplete(e)),
             Ok((i2, o)) => {
               res = OM::Output::combine(res, o, |mut res, o| {
                 res.push(o);
                 res
               });
               i = i2;
             }
+            Err(Err::Error(_)) => return Ok((i, res)),
+            Err(Err::Failure(e)) => return Err(Err::Failure(e)),
+            Err(Err::Incomplete(e)) => return Err(Err::Incomplete(e)),
           }
         }
+        Err(Err::Error(_)) => return Ok((i, res)),
+        Err(Err::Failure(e)) => return Err(Err::Failure(e)),
+        Err(Err::Incomplete(e)) => return Err(Err::Incomplete(e)),
       }
     }
   }