Consolidate delimited! and do_parse! macros

Author: dtolnay

src/fallback.rs

@@ -896,23 +896,26 @@ named!(token_kind -> TokenTree, alt!(
 ));
 
 named!(group -> Group, alt!(
-    delimited!(
-        punct!("("),
-        token_stream,
-        punct!(")")
-    ) => { |ts| Group::new(Delimiter::Parenthesis, ts) }
+    do_parse!(
+        punct!("(") >>
+        ts: token_stream >>
+        punct!(")") >>
+        (Group::new(Delimiter::Parenthesis, ts))
+    )
     |
-    delimited!(
-        punct!("["),
-        token_stream,
-        punct!("]")
-    ) => { |ts| Group::new(Delimiter::Bracket, ts) }
+    do_parse!(
+        punct!("[") >>
+        ts: token_stream >>
+        punct!("]") >>
+        (Group::new(Delimiter::Bracket, ts))
+    )
     |
-    delimited!(
-        punct!("{"),
-        token_stream,
-        punct!("}")
-    ) => { |ts| Group::new(Delimiter::Brace, ts) }
+    do_parse!(
+        punct!("{") >>
+        ts: token_stream >>
+        punct!("}") >>
+        (Group::new(Delimiter::Brace, ts))
+    )
 ));
 
 fn symbol(input: Cursor) -> PResult<TokenTree> {
@@ -1039,11 +1042,12 @@ fn cooked_string(input: Cursor) -> PResult<()> {
 }
 
 named!(byte_string -> (), alt!(
-    delimited!(
-        punct!("b\""),
-        cooked_byte_string,
-        tag!("\"")
-    ) => { |_| () }
+    do_parse!(
+        punct!("b\"") >>
+        cooked_byte_string >>
+        tag!("\"") >>
+        (())
+    )
     |
     preceded!(
         punct!("br"),

src/strnom.rs

@@ -368,15 +368,6 @@ macro_rules! preceded {
     };
 }
 
-macro_rules! delimited {
-    ($i:expr, $submac:ident!( $($args:tt)* ), $($rest:tt)+) => {
-        match tuple_parser!($i, (), $submac!($($args)*), $($rest)*) {
-            Err(LexError) => Err(LexError),
-            Ok((i1, (_, o, _))) => Ok((i1, o))
-        }
-    };
-}
-
 macro_rules! map {
     ($i:expr, $submac:ident!( $($args:tt)* ), $g:expr) => {
         match $submac!($i, $($args)*) {