Skip to content
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

Jump to bottom

Support alternative HashMap hasher #914

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Support alternative HashMap hasher #914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8397630
Support alternative HashMap hasher
alexheretic Sep 11, 2023
287173f
Merge branch 'master' into hashmap-alt-hash
alexheretic Sep 18, 2023
7d00665
Merge branch 'master' into hashmap-alt-hash
alexheretic Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
61 changes: 43 additions & 18 deletions prost-derive/src/field/map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
use anyhow::{bail, Error};
use proc_macro2::{Span, TokenStream};
use quote::quote;
use syn::punctuated::Punctuated;
use syn::{Expr, ExprLit, Ident, Lit, Meta, MetaNameValue, Token};
use syn::{punctuated::Punctuated, Expr, ExprLit, Ident, Lit, Meta, MetaNameValue, Token};

use crate::field::{scalar, set_option, tag_attr};

Expand Down Expand Up @@ -298,11 +297,6 @@ impl Field {
/// The Debug tries to convert any enumerations met into the variants if possible, instead of
/// outputting the raw numbers.
pub fn debug(&self, wrapper_name: TokenStream) -> TokenStream {
let type_name = match self.map_ty {
MapTy::HashMap => Ident::new("HashMap", Span::call_site()),
MapTy::BTreeMap => Ident::new("BTreeMap", Span::call_site()),
};

// A fake field for generating the debug wrapper
let key_wrapper = fake_scalar(self.key_ty.clone()).debug(quote!(KeyWrapper));
let key = self.key_ty.rust_type();
Expand Down Expand Up @@ -333,20 +327,51 @@ impl Field {
}

let value = ty.rust_type();
quote! {
struct #wrapper_name<'a>(&'a ::#libname::collections::#type_name<#key, #value>);
impl<'a> ::core::fmt::Debug for #wrapper_name<'a> {
#fmt
match self.map_ty {
MapTy::HashMap => {
let map = Ident::new("HashMap", Span::call_site());
quote! {
struct #wrapper_name<'a, S>(&'a ::#libname::collections::#map<#key, #value, S>);
impl<'a, S> ::core::fmt::Debug for #wrapper_name<'a, S> {
#fmt
}
}
}
MapTy::BTreeMap => {
let map = Ident::new("BTreeMap", Span::call_site());
quote! {
struct #wrapper_name<'a>(&'a ::#libname::collections::#map<#key, #value>);
impl<'a> ::core::fmt::Debug for #wrapper_name<'a> {
#fmt
}
}
}
}
}
ValueTy::Message => quote! {
struct #wrapper_name<'a, V: 'a>(&'a ::#libname::collections::#type_name<#key, V>);
impl<'a, V> ::core::fmt::Debug for #wrapper_name<'a, V>
where
V: ::core::fmt::Debug + 'a,
{
#fmt
ValueTy::Message => match self.map_ty {
MapTy::HashMap => {
let name = Ident::new("HashMap", Span::call_site());
quote! {
struct #wrapper_name<'a, V: 'a, S>(&'a ::#libname::collections::#name<#key, V, S>);
impl<'a, V, S> ::core::fmt::Debug for #wrapper_name<'a, V, S>
where
V: ::core::fmt::Debug + 'a,
{
#fmt
}
}
}
MapTy::BTreeMap => {
let map = Ident::new("BTreeMap", Span::call_site());
quote! {
struct #wrapper_name<'a, V: 'a>(&'a ::#libname::collections::#map<#key, V>);
impl<'a, V> ::core::fmt::Debug for #wrapper_name<'a, V>
where
V: ::core::fmt::Debug + 'a,
{
#fmt
}
}
}
},
}
Expand Down