Merge branch 'ijackson-rawstring'

Author: magiclen

src/trait_handlers/debug/common.rs

@@ -8,9 +8,10 @@ use crate::common::r#type::{dereference, find_idents_in_type};
 #[inline]
 pub(crate) fn create_debug_map_builder() -> proc_macro2::TokenStream {
     quote!(
-        struct RawString(&'static str);
+        #[allow(non_camel_case_types)] // We're using __ to help avoid clashes.
+        struct Educe__RawString(&'static str);
 
-        impl ::core::fmt::Debug for RawString {
+        impl ::core::fmt::Debug for Educe__RawString {
             #[inline]
             fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
                 f.write_str(self.0)

src/trait_handlers/debug/debug_enum.rs

@@ -119,15 +119,15 @@ impl TraitHandler for DebugEnumHandler {
                                     block_token_stream.extend(if name_string.is_some() {
                                         quote! (builder.field(stringify!(#key), &arg);)
                                     } else {
-                                        quote! (builder.entry(&RawString(stringify!(#key)), &arg);)
+                                        quote! (builder.entry(&Educe__RawString(stringify!(#key)), &arg);)
                                     });
                                 } else {
                                     debug_types.push(ty);
 
                                     block_token_stream.extend(if name_string.is_some() {
                                         quote! (builder.field(stringify!(#key), #field_name_var);)
                                     } else {
-                                        quote! (builder.entry(&RawString(stringify!(#key)), #field_name_var);)
+                                        quote! (builder.entry(&Educe__RawString(stringify!(#key)), #field_name_var);)
                                     });
                                 }
 
@@ -239,15 +239,15 @@ impl TraitHandler for DebugEnumHandler {
                                     block_token_stream.extend(if name_string.is_some() {
                                         quote! (builder.field(stringify!(#key), &arg);)
                                     } else {
-                                        quote! (builder.entry(&RawString(stringify!(#key)), &arg);)
+                                        quote! (builder.entry(&Educe__RawString(stringify!(#key)), &arg);)
                                     });
                                 } else {
                                     debug_types.push(ty);
 
                                     block_token_stream.extend(if name_string.is_some() {
                                         quote! (builder.field(stringify!(#key), #field_name_var);)
                                     } else {
-                                        quote! (builder.entry(&RawString(stringify!(#key)), #field_name_var);)
+                                        quote! (builder.entry(&Educe__RawString(stringify!(#key)), #field_name_var);)
                                     });
                                 }
 

src/trait_handlers/debug/debug_struct.rs

@@ -89,15 +89,15 @@ impl TraitHandler for DebugStructHandler {
                         builder_token_stream.extend(if name.is_some() {
                             quote! (builder.field(stringify!(#key), &arg);)
                         } else {
-                            quote! (builder.entry(&RawString(stringify!(#key)), &arg);)
+                            quote! (builder.entry(&Educe__RawString(stringify!(#key)), &arg);)
                         });
                     } else {
                         debug_types.push(ty);
 
                         builder_token_stream.extend(if name.is_some() {
                             quote! (builder.field(stringify!(#key), &self.#field_name);)
                         } else {
-                            quote! (builder.entry(&RawString(stringify!(#key)), &self.#field_name);)
+                            quote! (builder.entry(&Educe__RawString(stringify!(#key)), &self.#field_name);)
                         });
                     }