Fix async/await support for latest nightly

After rust-lang/rust#50120 procedural macros do not receive the parentheses as part of their attributes TokenStream. Also the proc_macro_non_items feature is necessary to use async_block.
rust-lang · Apr 29, 2018 · 5099913 · 5099913
1 parent 1a52eba
commit 5099913
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/futures-macro-async/src/lib.rs b/futures-macro-async/src/lib.rs
@@ -525,8 +525,8 @@ if_nightly! {
 
     impl synom::Synom for AsyncArgs {
         named!(parse -> Self, map!(
-            option!(parens!(call!(Punctuated::<AsyncArg, syn::token::Comma>::parse_separated_nonempty))),
-            |p| AsyncArgs(p.map(|d| d.1.into_iter().collect()).unwrap_or_default())
+            option!(call!(Punctuated::<AsyncArg, syn::token::Comma>::parse_separated_nonempty)),
+            |p| AsyncArgs(p.map(|d| d.into_iter().collect()).unwrap_or_default())
         ));
     }
 
@@ -546,8 +546,8 @@ if_nightly! {
 
     impl synom::Synom for AsyncStreamArgs {
         named!(parse -> Self, map!(
-            option!(parens!(call!(Punctuated::<AsyncStreamArg, syn::token::Comma>::parse_separated_nonempty))),
-            |p| AsyncStreamArgs(p.map(|d| d.1.into_iter().collect()).unwrap_or_default())
+            option!(call!(Punctuated::<AsyncStreamArg, syn::token::Comma>::parse_separated_nonempty)),
+            |p| AsyncStreamArgs(p.map(|d| d.into_iter().collect()).unwrap_or_default())
         ));
     }
 }
diff --git a/futures/testcrate/ui/move-captured-variable.rs b/futures/testcrate/ui/move-captured-variable.rs
@@ -1,4 +1,4 @@
-#![feature(proc_macro, generators, pin)]
+#![feature(proc_macro, proc_macro_non_items, generators, pin)]
 
 extern crate futures;
 

diff --git a/futures/tests/async_await_tests.rs b/futures/tests/async_await_tests.rs
@@ -1,4 +1,4 @@
-#![cfg_attr(feature = "nightly", feature(proc_macro, generators, pin))]
+#![cfg_attr(feature = "nightly", feature(proc_macro, proc_macro_non_items, generators, pin))]
 
 extern crate futures;