Merging upstream version 1.70.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 16 insertions, 14 deletions

diff --git a/vendor/syn/src/custom_punctuation.rs b/vendor/syn/src/custom_punctuation.rs
index 118a8453d..e8cbcd2fe 100644
--- a/vendor/syn/src/custom_punctuation.rs
+++ b/vendor/syn/src/custom_punctuation.rs
@@ -92,16 +92,18 @@ macro_rules! custom_punctuation {
             }
         }
 
-        impl $crate::__private::Default for $ident {
-            fn default() -> Self {
-                $ident($crate::__private::Span::call_site())
+        const _: () = {
+            impl $crate::__private::Default for $ident {
+                fn default() -> Self {
+                    $ident($crate::__private::Span::call_site())
+                }
             }
-        }
 
-        $crate::impl_parse_for_custom_punctuation!($ident, $($tt)+);
-        $crate::impl_to_tokens_for_custom_punctuation!($ident, $($tt)+);
-        $crate::impl_clone_for_custom_punctuation!($ident, $($tt)+);
-        $crate::impl_extra_traits_for_custom_punctuation!($ident, $($tt)+);
+            $crate::impl_parse_for_custom_punctuation!($ident, $($tt)+);
+            $crate::impl_to_tokens_for_custom_punctuation!($ident, $($tt)+);
+            $crate::impl_clone_for_custom_punctuation!($ident, $($tt)+);
+            $crate::impl_extra_traits_for_custom_punctuation!($ident, $($tt)+);
+        };
     };
 }
 
@@ -113,18 +115,18 @@ macro_rules! impl_parse_for_custom_punctuation {
     ($ident:ident, $($tt:tt)+) => {
         impl $crate::token::CustomToken for $ident {
             fn peek(cursor: $crate::buffer::Cursor) -> bool {
-                $crate::token::parsing::peek_punct(cursor, $crate::stringify_punct!($($tt)+))
+                $crate::__private::peek_punct(cursor, $crate::stringify_punct!($($tt)+))
             }
 
             fn display() -> &'static $crate::__private::str {
-                concat!("`", $crate::stringify_punct!($($tt)+), "`")
+                $crate::__private::concat!("`", $crate::stringify_punct!($($tt)+), "`")
             }
         }
 
         impl $crate::parse::Parse for $ident {
             fn parse(input: $crate::parse::ParseStream) -> $crate::parse::Result<$ident> {
                 let spans: $crate::custom_punctuation_repr!($($tt)+) =
-                    $crate::token::parsing::punct(input, $crate::stringify_punct!($($tt)+))?;
+                    $crate::__private::parse_punct(input, $crate::stringify_punct!($($tt)+))?;
                 Ok($ident(spans))
             }
         }
@@ -147,7 +149,7 @@ macro_rules! impl_to_tokens_for_custom_punctuation {
     ($ident:ident, $($tt:tt)+) => {
         impl $crate::__private::ToTokens for $ident {
             fn to_tokens(&self, tokens: &mut $crate::__private::TokenStream2) {
-                $crate::token::printing::punct($crate::stringify_punct!($($tt)+), &self.spans, tokens)
+                $crate::__private::print_punct($crate::stringify_punct!($($tt)+), &self.spans, tokens)
             }
         }
     };
@@ -194,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))
             }
         }
 
@@ -295,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)),+)
     };
 }