Skip to content

Rename RawString to Educe__RawString #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
magiclen merged 1 commit into from
Jun 1, 2024
Merged

Rename RawString to Educe__RawString #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/trait_handlers/debug/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions src/trait_handlers/debug/debug_enum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);)
});
}

Expand Down Expand Up @@ -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);)
});
}

Expand Down
4 changes: 2 additions & 2 deletions src/trait_handlers/debug/debug_struct.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);)
});
}

Expand Down