Update to nightly-2017-01-04

Author: dtolnay

README.md

@@ -6,10 +6,7 @@ Procedural functionlike!() macros using only Macros 1.1
 
 Did you think Macros 1.1 was only for custom derives? Think again.
 
-*Note:* Currently only works with nightly-2016-11-06 because of
-[rust-lang/rust#38706](https://github.com/rust-lang/rust/issues/38706). The bug
-has been fixed in master and the fix will be in the next nightly after
-nightly-2017-01-01 as well as backported to 1.15.0-beta.
+*Note:* Requires nightly-2017-01-04 or later.
 
 ## Defining procedural macros
 

impl/src/lib.rs

@@ -14,7 +14,7 @@ pub fn hack_expr(input: TokenStream) -> TokenStream {
                 #[derive({})]
                 #[allow(unused)]
                 enum ProcMacroHack {{
-                    Input = {{ stringify!($($tt)*); 0 }}
+                    Input = (stringify!($($tt)*), 0).1
                 }}
 
                 proc_macro_call!()
@@ -36,7 +36,7 @@ pub fn hack_item(input: TokenStream) -> TokenStream {
                 #[derive({})]
                 #[allow(unused)]
                 enum ProcMacroHack {{
-                    Input = {{ stringify!($($tt)*); 0 }}
+                    Input = (stringify!($($tt)*), 0).1
                 }}
             }}
         }}

src/lib.rs

@@ -39,8 +39,8 @@ macro_rules! proc_macro_expr_impl {
             pub fn $func(input: $crate::TokenStream) -> $crate::TokenStream {
                 let source = input.to_string();
 
-                let prefix = "#[allow(unused)]\nenum ProcMacroHack { Input = { stringify!(";
-                let suffix = "); 0 }, }\n";
+                let prefix = "#[allow(unused)]\nenum ProcMacroHack { Input = (stringify!(";
+                let suffix = "), 0).1, }\n";
                 if !(source.starts_with(prefix) && source.ends_with(suffix)) {
                     panic!("`{}` procedural macro failed", stringify!($func));
                 }
@@ -73,8 +73,8 @@ macro_rules! proc_macro_item_impl {
             pub fn $func(input: $crate::TokenStream) -> $crate::TokenStream {
                 let source = input.to_string();
 
-                let prefix = "#[allow(unused)]\nenum ProcMacroHack { Input = { stringify!(";
-                let suffix = "); 0 }, }\n";
+                let prefix = "#[allow(unused)]\nenum ProcMacroHack { Input = (stringify!(";
+                let suffix = "), 0).1, }\n";
                 if !(source.starts_with(prefix) && source.ends_with(suffix)) {
                     panic!("`{}` procedural macro failed", stringify!($func));
                 }