commit 9be32585644c40ba25f24786b683f3f51dbdb799
author David Tolnay <dtolnay@gmail.com> Tue Jul 31 22:37:26 2018 -0700
committer David Tolnay <dtolnay@gmail.com> Tue Jul 31 23:04:06 2018 -0700
tree 1aa177d1d9396c038b26f619f91a4cd18bcef09e
parent 8339a7bdec9dc518d9812f5e76a24db3e51f3487

Verbatim logic in one place

src/expr.rs

diff --git a/src/expr.rs b/src/expr.rs
index 6141caa..7910cf7 100644
--- a/src/expr.rs
+++ b/src/expr.rs
@@ -1612,7 +1612,7 @@
         |
         call!(expr_closure, allow_struct)
         |
-        call!(expr_unstable_async_closure, allow_struct)
+        call!(expr_unstable_async_closure, allow_struct) => { Expr::Verbatim }
         |
         cond_reduce!(allow_block, syn!(ExprBlock)) => { Expr::Block }
         |
@@ -2128,13 +2128,8 @@
     ));
 
     #[cfg(feature = "full")]
-    fn grab_cursor(cursor: Cursor) -> PResult<Cursor> {
-        Ok((cursor, cursor))
-    }
-
-    #[cfg(feature = "full")]
-    named!(expr_unstable_async_closure(allow_struct: bool) -> Expr, do_parse!(
-        begin: call!(grab_cursor) >>
+    named!(expr_unstable_async_closure(allow_struct: bool) -> ExprVerbatim, do_parse!(
+        begin: call!(verbatim::grab_cursor) >>
         _attrs: many0!(Attribute::parse_outer) >>
         _asyncness: keyword!(async) >>
         _movability: option!(keyword!(static)) >>
@@ -2156,30 +2151,22 @@
             |
             map!(ambiguous_expr!(allow_struct), |e| (ReturnType::Default, e))
         ) >>
-        end: call!(grab_cursor) >>
-        ({
-            let tts = begin.token_stream().into_iter().collect::<Vec<_>>();
-            let len = tts.len() - end.token_stream().into_iter().count();
-            ExprVerbatim {
-                tts: tts.into_iter().take(len).collect(),
-            }.into()
+        end: call!(verbatim::grab_cursor) >>
+        (ExprVerbatim {
+            tts: verbatim::token_range(begin..end),
         })
     ));
 
     #[cfg(feature = "full")]
     named!(unstable_async_block -> ExprVerbatim, do_parse!(
-        begin: call!(grab_cursor) >>
+        begin: call!(verbatim::grab_cursor) >>
         _attrs: many0!(Attribute::parse_outer) >>
         _asyncness: keyword!(async) >>
         _capture: option!(keyword!(move)) >>
         _body: syn!(Block) >>
-        end: call!(grab_cursor) >>
-        ({
-            let tts = begin.token_stream().into_iter().collect::<Vec<_>>();
-            let len = tts.len() - end.token_stream().into_iter().count();
-            ExprVerbatim {
-                tts: tts.into_iter().take(len).collect(),
-            }.into()
+        end: call!(verbatim::grab_cursor) >>
+        (ExprVerbatim {
+            tts: verbatim::token_range(begin..end),
         })
     ));