Merge pull request 1358 from dtolnay/macroexport

Author: dtolnay

src/custom_keyword.rs

@@ -131,29 +131,29 @@ macro_rules! impl_parse_for_custom_keyword {
         impl $crate::token::CustomToken for $ident {
             fn peek(cursor: $crate::buffer::Cursor) -> $crate::__private::bool {
                 if let $crate::__private::Some((ident, _rest)) = cursor.ident() {
-                    ident == stringify!($ident)
+                    ident == $crate::__private::stringify!($ident)
                 } else {
                     false
                 }
             }
 
             fn display() -> &'static $crate::__private::str {
-                concat!("`", stringify!($ident), "`")
+                $crate::__private::concat!("`", $crate::__private::stringify!($ident), "`")
             }
         }
 
         impl $crate::parse::Parse for $ident {
             fn parse(input: $crate::parse::ParseStream) -> $crate::parse::Result<$ident> {
                 input.step(|cursor| {
                     if let $crate::__private::Some((ident, rest)) = cursor.ident() {
-                        if ident == stringify!($ident) {
+                        if ident == $crate::__private::stringify!($ident) {
                             return $crate::__private::Ok(($ident { span: ident.span() }, rest));
                         }
                     }
-                    $crate::__private::Err(cursor.error(concat!(
+                    $crate::__private::Err(cursor.error($crate::__private::concat!(
                         "expected `",
-                        stringify!($ident),
-                        "`"
+                        $crate::__private::stringify!($ident),
+                        "`",
                     )))
                 })
             }
@@ -177,7 +177,7 @@ macro_rules! impl_to_tokens_for_custom_keyword {
     ($ident:ident) => {
         impl $crate::__private::ToTokens for $ident {
             fn to_tokens(&self, tokens: &mut $crate::__private::TokenStream2) {
-                let ident = $crate::Ident::new(stringify!($ident), self.span);
+                let ident = $crate::Ident::new($crate::__private::stringify!($ident), self.span);
                 $crate::__private::TokenStreamExt::append(tokens, ident);
             }
         }
@@ -227,7 +227,11 @@ macro_rules! impl_extra_traits_for_custom_keyword {
             fn fmt(&self, f: &mut $crate::__private::Formatter) -> $crate::__private::fmt::Result {
                 $crate::__private::Formatter::write_str(
                     f,
-                    concat!("Keyword [", stringify!($ident), "]"),
+                    $crate::__private::concat!(
+                        "Keyword [",
+                        $crate::__private::stringify!($ident),
+                        "]",
+                    ),
                 )
             }
         }

src/custom_punctuation.rs

@@ -119,7 +119,7 @@ macro_rules! impl_parse_for_custom_punctuation {
             }
 
             fn display() -> &'static $crate::__private::str {
-                concat!("`", $crate::stringify_punct!($($tt)+), "`")
+                $crate::__private::concat!("`", $crate::stringify_punct!($($tt)+), "`")
             }
         }
 
@@ -196,7 +196,7 @@ macro_rules! impl_extra_traits_for_custom_punctuation {
     ($ident:ident, $($tt:tt)+) => {
         impl $crate::__private::Debug for $ident {
             fn fmt(&self, f: &mut $crate::__private::Formatter) -> $crate::__private::fmt::Result {
-                $crate::__private::Formatter::write_str(f, stringify!($ident))
+                $crate::__private::Formatter::write_str(f, $crate::__private::stringify!($ident))
             }
         }
 
@@ -297,6 +297,6 @@ macro_rules! custom_punctuation_unexpected {
 #[macro_export]
 macro_rules! stringify_punct {
     ($($tt:tt)+) => {
-        concat!($(stringify!($tt)),+)
+        $crate::__private::concat!($($crate::__private::stringify!($tt)),+)
     };
 }

src/export.rs

@@ -1,11 +1,13 @@
 pub use std::clone::Clone;
 pub use std::cmp::{Eq, PartialEq};
+pub use std::concat;
 pub use std::default::Default;
 pub use std::fmt::{self, Debug, Formatter};
 pub use std::hash::{Hash, Hasher};
 pub use std::marker::Copy;
 pub use std::option::Option::{None, Some};
 pub use std::result::Result::{Err, Ok};
+pub use std::stringify;
 
 #[cfg(feature = "printing")]
 pub use quote;