commit 7977715292614d999ae1ce92d0f065393fad9e7c
author David Tolnay <dtolnay@gmail.com> Thu Jul 18 11:14:10 2019 -0700
committer David Tolnay <dtolnay@gmail.com> Thu Jul 18 11:14:10 2019 -0700
tree a277ba18b4b7ebef93059f56640e38a6c990ef2c
parent 8abb94d4985562cda2f9f07ab38e4f1e9d68325b

Rename the ident used for interpolated vars

src/lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index 98ac2fc..e7d39d2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -451,8 +451,8 @@
         $crate::pounded_var_names!($finish!($($extra)*) ($($found)*) $($inner)* $($rest)*)
     };
 
-    ($finish:ident!($($extra:tt)*) ($($found:ident)*) # $first:ident $($rest:tt)*) => {
-        $crate::pounded_var_names!($finish!($($extra)*) ($($found)* $first) $($rest)*)
+    ($finish:ident!($($extra:tt)*) ($($found:ident)*) # $var:ident $($rest:tt)*) => {
+        $crate::pounded_var_names!($finish!($($extra)*) ($($found)* $var) $($rest)*)
     };
 
     ($finish:ident!($($extra:tt)*) ($($found:ident)*) ( $($inner:tt)* ) $($rest:tt)*) => {
@@ -620,10 +620,10 @@
     ($tokens:ident $span:ident $b3:tt # ( $($inner:tt)* ) ($sep:tt) * $a2:tt $a3:tt) => {};
     ($tokens:ident $span:ident # ( $($inner:tt)* ) $sep:tt (*) $a1:tt $a2:tt $a3:tt) => {};
 
-    ($tokens:ident $span:ident $b3:tt $b2:tt $b1:tt (#) $first:ident $a2:tt $a3:tt) => {
-        $crate::ToTokens::to_tokens(&$first, &mut $tokens);
+    ($tokens:ident $span:ident $b3:tt $b2:tt $b1:tt (#) $var:ident $a2:tt $a3:tt) => {
+        $crate::ToTokens::to_tokens(&$var, &mut $tokens);
     };
-    ($tokens:ident $span:ident $b3:tt $b2:tt # ($first:ident) $a1:tt $a2:tt $a3:tt) => {};
+    ($tokens:ident $span:ident $b3:tt $b2:tt # ($var:ident) $a1:tt $a2:tt $a3:tt) => {};
     ($tokens:ident $span:ident $b3:tt $b2:tt $b1:tt ($curr:tt) $a1:tt $a2:tt $a3:tt) => {
         $crate::quote_token!($tokens $span $curr);
     };
@@ -841,7 +841,7 @@
         $crate::__rt::push_sub_eq(&mut $tokens, $span);
     };
 
-    ($tokens:ident $span:ident $first:tt) => {
-        $crate::__rt::parse(&mut $tokens, $span, stringify!($first));
+    ($tokens:ident $span:ident $other:tt) => {
+        $crate::__rt::parse(&mut $tokens, $span, stringify!($other));
     };
 }