commit 04cd0b7001d793752b6a6533569ce53896dd4dad
author David Tolnay <dtolnay@gmail.com> Sun Apr 14 13:22:33 2019 -0700
committer David Tolnay <dtolnay@gmail.com> Sun Apr 14 13:22:33 2019 -0700
tree 79bbb8282b847bb10ab710d583693f29f1f9b2b9
parent 76aabde0933ed3f9eb7b72c5148c9e42c5501155

Give conflict-proof names to custom_punctuation helpers

src/custom_punctuation.rs

diff --git a/src/custom_punctuation.rs b/src/custom_punctuation.rs
index 9e246a4..99dd3d0 100644
--- a/src/custom_punctuation.rs
+++ b/src/custom_punctuation.rs
@@ -122,7 +122,7 @@
             }
 
             fn display() -> &'static $crate::export::str {
-                my_concat!("`", stringify_punct!($($tt)+), "`")
+                custom_punctuation_concat!("`", stringify_punct!($($tt)+), "`")
             }
         }
 
@@ -283,13 +283,13 @@
     ($mode:ident, -=)    => { 2 };
     ($mode:ident, ~)     => { 1 };
     (lenient, $tt:tt)    => { 0 };
-    (strict, $tt:tt)     => {{ unexpected!($tt); 0 }};
+    (strict, $tt:tt)     => {{ custom_punctuation_unexpected!($tt); 0 }};
 }
 
 // Not public API.
 #[doc(hidden)]
 #[macro_export]
-macro_rules! unexpected {
+macro_rules! custom_punctuation_unexpected {
     () => {};
 }
 
@@ -306,7 +306,7 @@
 // Without this, local_inner_macros breaks when looking for concat!
 #[doc(hidden)]
 #[macro_export]
-macro_rules! my_concat {
+macro_rules! custom_punctuation_concat {
     ($($tt:tt)*) => {
         concat!($($tt)*)
     };