commit 760fd66465a7cc5b23268bcaebdc0365b6b8a602
author Michael Layzell <michael@thelayzells.com> Wed May 31 22:46:05 2017 -0400
committer Michael Layzell <michael@thelayzells.com> Thu Jun 01 00:26:04 2017 -0400
tree 405a966fb6dbed7a0485117cb7d4b811c8091ab6
parent d5de44bac60bc55eebcd6c566aac33d2b790fcfb

Switch from IResult to PResult in synom

synom/src/helper.rs

diff --git a/synom/src/helper.rs b/synom/src/helper.rs
index b0bc7cf..d04b8ba 100644
--- a/synom/src/helper.rs
+++ b/synom/src/helper.rs
@@ -17,8 +17,10 @@
 macro_rules! option {
     ($i:expr, $submac:ident!( $($args:tt)* )) => {
         match $submac!($i, $($args)*) {
-            $crate::IResult::Done(i, o) => $crate::IResult::Done(i, Some(o)),
-            $crate::IResult::Error => $crate::IResult::Done($i, None),
+            ::std::result::Result::Ok((i, o)) =>
+                ::std::result::Result::Ok((i, Some(o))),
+            ::std::result::Result::Err(_) =>
+                ::std::result::Result::Ok(($i, None)),
         }
     };
 
@@ -61,8 +63,10 @@
 macro_rules! opt_vec {
     ($i:expr, $submac:ident!( $($args:tt)* )) => {
         match $submac!($i, $($args)*) {
-            $crate::IResult::Done(i, o) => $crate::IResult::Done(i, o),
-            $crate::IResult::Error => $crate::IResult::Done($i, Vec::new()),
+            ::std::result::Result::Ok((i, o)) =>
+                ::std::result::Result::Ok((i, o)),
+            ::std::result::Result::Err(_) =>
+                ::std::result::Result::Ok(($i, Vec::new()))
         }
     };
 }
@@ -91,7 +95,7 @@
 #[macro_export]
 macro_rules! epsilon {
     ($i:expr,) => {
-        $crate::IResult::Done($i, ())
+        ::std::result::Result::Ok(($i, ()))
     };
 }
 
@@ -132,12 +136,13 @@
 macro_rules! tap {
     ($i:expr, $name:ident : $submac:ident!( $($args:tt)* ) => $e:expr) => {
         match $submac!($i, $($args)*) {
-            $crate::IResult::Done(i, o) => {
+            ::std::result::Result::Ok((i, o)) => {
                 let $name = o;
                 $e;
-                $crate::IResult::Done(i, ())
+                ::std::result::Result::Ok((i, ()))
             }
-            $crate::IResult::Error => $crate::IResult::Error,
+            ::std::result::Result::Err(err) =>
+                ::std::result::Result::Err(err),
         }
     };