Merge pull request #547 from ordian/master

fix(alt_complete): alt_complete! should never return incomplete
rust-bakery · Sep 21, 2017 · 628e012 · 628e012
2 parents b918642 + 4df732f
commit 628e012
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/branch.rs b/src/branch.rs
@@ -327,15 +327,15 @@ macro_rules! alt_complete (
   );
 
   ($i:expr, $subrule:ident!( $($args:tt)* ) => { $gen:expr }) => (
-    alt!(__impl $i, $subrule!($($args)*) => { $gen } | __end)
+    alt!(__impl $i, complete!($subrule!($($args)*)) => { $gen } | __end)
   );
 
   ($i:expr, $e:ident) => (
     alt_complete!($i, call!($e));
   );
 
   ($i:expr, $subrule:ident!( $($args:tt)*)) => (
-    alt!(__impl $i, $subrule!($($args)*) | __end)
+    alt!(__impl $i, complete!($subrule!($($args)*)) | __end)
   );
 );
 
@@ -813,7 +813,7 @@ mod tests {
     );
 
     let a = &b""[..];
-    assert_eq!(ac(a), Incomplete(Needed::Size(2)));
+    assert_eq!(ac(a), Error(error_position!(ErrorKind::Alt, a)));
     let a = &b"ef"[..];
     assert_eq!(ac(a), Done(&b""[..], &b"ef"[..]));
     let a = &b"cde"[..];