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

Add some forwarding impls Hash, Ord, PartialOrd #37

Merged
merged 6 commits into from
Oct 27, 2022
Merged

Add some forwarding impls Hash, Ord, PartialOrd #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
17b65c3
Add some forwarding impls Hash, Ord, PartialOrd
udoprog Oct 27, 2022
d85726c
Fix comparison operation
udoprog Oct 27, 2022
d3fef54
Revert "Fix comparison operation"
udoprog Oct 27, 2022
bc8af85
Simplify unit_variants impl
udoprog Oct 27, 2022
80fbf60
Simplify token declarations and lazily build paths
udoprog Oct 27, 2022
15c82fe
Go gently into that dark night Clippy
udoprog Oct 27, 2022
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
163 changes: 92 additions & 71 deletions fixed-map-derive/src/any_variants.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ pub(crate) fn implement(cx: &Ctxt<'_>, en: &DataEnum) -> Result<TokenStream, ()>
let ident = &cx.ast.ident;
let lt = cx.lt;

let clone = &cx.toks.clone;
let copy = &cx.toks.copy;
let default = &cx.toks.default;
let eq = &cx.toks.eq;
let key_trait = &cx.toks.key_trait;
let mem = &cx.toks.mem;
let option = &cx.toks.option;
let partial_eq = &cx.toks.partial_eq;
let storage_trait = &cx.toks.storage_trait;
let clone_t = cx.toks.clone_t();
let copy_t = cx.toks.copy_t();
let default_t = cx.toks.default_t();
let eq_t = cx.toks.eq_t();
let key_t = cx.toks.key_t();
let mem = cx.toks.mem();
let option = cx.toks.option();
let partial_eq_t = cx.toks.partial_eq_t();
let storage_t = cx.toks.storage_t();

let const_wrapper = Ident::new(
&format!("__IMPL_KEY_FOR_{}", cx.ast.ident),
Expand All @@ -32,6 +32,7 @@ pub(crate) fn implement(cx: &Ctxt<'_>, en: &DataEnum) -> Result<TokenStream, ()>
let mut field_inits = Vec::new();
let mut field_clones = Vec::new();
let mut field_partial_eqs = Vec::new();
let mut field_partial_not_eqs = Vec::new();
let mut contains_key = Vec::new();
let mut get = Vec::new();
let mut get_mut = Vec::new();
Expand All @@ -46,14 +47,21 @@ pub(crate) fn implement(cx: &Ctxt<'_>, en: &DataEnum) -> Result<TokenStream, ()>
let var = &variant.ident;
let name = Ident::new(&format!("f{}", index), Span::call_site());

field_inits.push(quote!(#name: #default::default()));
field_clones.push(quote!(#name: #clone::clone(&self.#name)));
field_inits.push(quote!(#name: #default_t::default()));
field_clones.push(quote!(#name: #clone_t::clone(&self.#name)));

field_partial_eqs.push(quote! {
if self.#name != other.#name {
if #partial_eq_t::ne(&self.#name, &other.#name) {
return false;
}
});

field_partial_not_eqs.push(quote! {
if #partial_eq_t::ne(&self.#name, &other.#name) {
return true;
}
});

let kind = match &variant.fields {
Fields::Unit => {
len.push(quote!(usize::from(#option::is_some(&self.#name))));
Expand All @@ -67,7 +75,7 @@ pub(crate) fn implement(cx: &Ctxt<'_>, en: &DataEnum) -> Result<TokenStream, ()>
insert.push(quote!(#mem::replace(&mut self.#name, #option::Some(value))));
remove.push(quote!(#mem::replace(&mut self.#name, #option::None)));
retain.push(quote! {
if let Some(val) = #option::as_mut(&mut self.#name) {
if let #option::Some(val) = #option::as_mut(&mut self.#name) {
if !func(#ident::#var, val) {
self.#name = None;
}
Expand All @@ -86,8 +94,8 @@ pub(crate) fn implement(cx: &Ctxt<'_>, en: &DataEnum) -> Result<TokenStream, ()>
}

let element = unnamed.unnamed.first().expect("Expected one element");
let storage = quote!(<#element as #key_trait>::Storage::<V>);
let as_storage = quote!(<#storage as #storage_trait<#element, V>>);
let storage = quote!(<#element as #key_t>::Storage::<V>);
let as_storage = quote!(<#storage as #storage_t<#element, V>>);

len.push(quote!(#as_storage::len(&self.#name)));
is_empty.push(quote!(#as_storage::is_empty(&self.#name)));
Expand All @@ -105,7 +113,7 @@ pub(crate) fn implement(cx: &Ctxt<'_>, en: &DataEnum) -> Result<TokenStream, ()>
#as_storage::retain(&mut self.#name, |k, v| func(#ident::#var(k), v));
});

copy_bounds.push(quote!(#storage: #copy));
copy_bounds.push(quote!(#storage: #copy_t));

FieldKind::Complex {
element: quote!(#element),
Expand All @@ -131,7 +139,7 @@ pub(crate) fn implement(cx: &Ctxt<'_>, en: &DataEnum) -> Result<TokenStream, ()>
let mut iter_clone = Vec::new();

for FieldSpec { name, .. } in &field_specs {
iter_clone.push(quote!(#name: #clone::clone(&self.#name)));
iter_clone.push(quote!(#name: #clone_t::clone(&self.#name)));
}

let pattern = &pattern;
Expand All @@ -157,7 +165,7 @@ pub(crate) fn implement(cx: &Ctxt<'_>, en: &DataEnum) -> Result<TokenStream, ()>
}

#[automatically_derived]
impl<V> #clone for Storage<V> where V: #clone {
impl<V> #clone_t for Storage<V> where V: #clone_t {
#[inline]
fn clone(&self) -> Storage<V> {
Storage {
Expand All @@ -167,22 +175,28 @@ pub(crate) fn implement(cx: &Ctxt<'_>, en: &DataEnum) -> Result<TokenStream, ()>
}

#[automatically_derived]
impl<V> #copy for Storage<V> where V: #copy, #(#copy_bounds,)* {}
impl<V> #copy_t for Storage<V> where V: #copy_t, #(#copy_bounds,)* {}

#[automatically_derived]
impl<V> #partial_eq for Storage<V> where V: #partial_eq {
impl<V> #partial_eq_t for Storage<V> where V: #partial_eq_t {
#[inline]
fn eq(&self, other: &Storage<V>) -> bool {
#(#field_partial_eqs;)*
true
}

#[inline]
fn ne(&self, other: &Storage<V>) -> bool {
#(#field_partial_not_eqs;)*
false
}
}

#[automatically_derived]
impl<V> #eq for Storage<V> where V: #eq {}
impl<V> #eq_t for Storage<V> where V: #eq_t {}

#[automatically_derived]
impl<V> #default for Storage<V> {
impl<V> #default_t for Storage<V> {
#[inline]
fn default() -> Self {
Self {
Expand All @@ -192,7 +206,7 @@ pub(crate) fn implement(cx: &Ctxt<'_>, en: &DataEnum) -> Result<TokenStream, ()>
}

#[automatically_derived]
impl<V> #storage_trait<#ident, V> for Storage<V> {
impl<V> #storage_t<#ident, V> for Storage<V> {
type Iter<#lt> = Iter<#lt, V> where V: #lt;
type Keys<#lt> = Keys<#lt, V> where V: #lt;
type Values<#lt> = Values<#lt, V> where V: #lt;
Expand Down Expand Up @@ -314,7 +328,7 @@ pub(crate) fn implement(cx: &Ctxt<'_>, en: &DataEnum) -> Result<TokenStream, ()>
}

#[automatically_derived]
impl #key_trait for #ident {
impl #key_t for #ident {
type Storage<V> = Storage<V>;
}

Expand All @@ -339,9 +353,9 @@ fn build_iter_next(
assoc_type: &Ident,
lt: Option<&syn::Lifetime>,
) -> Result<(), ()> {
let option = &cx.toks.option;
let iterator_t = &cx.toks.iterator_t;
let double_ended_iterator_t = &cx.toks.double_ended_iterator_t;
let option = cx.toks.option();
let iterator_t = cx.toks.iterator_t();
let double_ended_iterator_t = cx.toks.double_ended_iterator_t();
let ident = &cx.ast.ident;

for FieldSpec {
Expand Down Expand Up @@ -417,13 +431,14 @@ fn build_iter_impl(
let type_name = syn::Ident::new(id, Span::call_site());

let lt = cx.lt;
let option = &cx.toks.option;
let iterator_t = &cx.toks.iterator_t;
let double_ended_iterator_t = &cx.toks.double_ended_iterator_t;
let clone = &cx.toks.clone;
let ident = &cx.ast.ident;
let vis = &cx.ast.vis;

let option = cx.toks.option();
let iterator_t = cx.toks.iterator_t();
let double_ended_iterator_t = cx.toks.double_ended_iterator_t();
let clone_t = cx.toks.clone_t();

let mut step_forward = IteratorNext::default();
let mut step_backward = IteratorNextBack::default();

Expand All @@ -441,7 +456,7 @@ fn build_iter_impl(
)?;

for FieldSpec { name, kind, .. } in field_specs {
iter_clone.push(quote!(#name: #clone::clone(&self.#name)));
iter_clone.push(quote!(#name: #clone_t::clone(&self.#name)));

match kind {
FieldKind::Simple => {
Expand Down Expand Up @@ -470,7 +485,7 @@ fn build_iter_impl(
}

#[automatically_derived]
impl<#lt, V> #clone for #type_name<#lt, V> where V: #lt {
impl<#lt, V> #clone_t for #type_name<#lt, V> where V: #lt {
#[inline]
fn clone(&self) -> Self {
Self {
Expand Down Expand Up @@ -514,15 +529,16 @@ fn build_keys_impl(
let type_name = syn::Ident::new(id, Span::call_site());

let lt = cx.lt;
let option = &cx.toks.option;
let iterator_t = &cx.toks.iterator_t;
let double_ended_iterator_t = &cx.toks.double_ended_iterator_t;
let clone = &cx.toks.clone;
let bool_type = &cx.toks.bool_type;
let mem = &cx.toks.mem;
let ident = &cx.ast.ident;
let vis = &cx.ast.vis;

let bool_type = cx.toks.bool_type();
let clone_t = cx.toks.clone_t();
let double_ended_iterator_t = cx.toks.double_ended_iterator_t();
let iterator_t = cx.toks.iterator_t();
let mem = cx.toks.mem();
let option = cx.toks.option();

let mut step_forward = IteratorNext::default();
let mut step_backward = IteratorNextBack::default();

Expand All @@ -539,7 +555,7 @@ fn build_keys_impl(
..
} in field_specs
{
iter_clone.push(quote!(#name: #clone::clone(&self.#name)));
iter_clone.push(quote!(#name: #clone_t::clone(&self.#name)));

match kind {
FieldKind::Simple => {
Expand Down Expand Up @@ -608,7 +624,7 @@ fn build_keys_impl(
}

#[automatically_derived]
impl<#lt, V> #clone for #type_name<#lt, V> where V: #lt {
impl<#lt, V> #clone_t for #type_name<#lt, V> where V: #lt {
#[inline]
fn clone(&self) -> Self {
Self {
Expand Down Expand Up @@ -652,12 +668,13 @@ fn build_values_impl(
let type_name = syn::Ident::new(id, Span::call_site());

let lt = cx.lt;
let option = &cx.toks.option;
let iterator_t = &cx.toks.iterator_t;
let double_ended_iterator_t = &cx.toks.double_ended_iterator_t;
let clone = &cx.toks.clone;
let vis = &cx.ast.vis;

let clone_t = cx.toks.clone_t();
let double_ended_iterator_t = cx.toks.double_ended_iterator_t();
let iterator_t = cx.toks.iterator_t();
let option = cx.toks.option();

let mut step_forward = IteratorNext::default();
let mut step_backward = IteratorNextBack::default();

Expand All @@ -673,7 +690,7 @@ fn build_values_impl(
..
} in field_specs
{
iter_clone.push(quote!(#name: #clone::clone(&self.#name)));
iter_clone.push(quote!(#name: #clone_t::clone(&self.#name)));

match kind {
FieldKind::Simple => {
Expand Down Expand Up @@ -742,7 +759,7 @@ fn build_values_impl(
}

#[automatically_derived]
impl<#lt, V> #clone for #type_name<#lt, V> where V: #lt {
impl<#lt, V> #clone_t for #type_name<#lt, V> where V: #lt {
#[inline]
fn clone(&self) -> Self {
Self {
Expand Down Expand Up @@ -785,12 +802,13 @@ fn build_iter_mut_impl(
) -> Result<(TokenStream, Vec<TokenStream>), ()> {
let type_name = syn::Ident::new(id, Span::call_site());

let lt = cx.lt;
let ident = &cx.ast.ident;
let lt = cx.lt;
let vis = &cx.ast.vis;
let iterator_t = &cx.toks.iterator_t;
let double_ended_iterator_t = &cx.toks.double_ended_iterator_t;
let option = &cx.toks.option;

let double_ended_iterator_t = cx.toks.double_ended_iterator_t();
let iterator_t = cx.toks.iterator_t();
let option = cx.toks.option();

let mut step_forward = IteratorNext::default();
let mut step_backward = IteratorNextBack::default();
Expand Down Expand Up @@ -871,11 +889,12 @@ fn build_values_mut_impl(
let type_name = syn::Ident::new(id, Span::call_site());

let lt = cx.lt;
let option = &cx.toks.option;
let iterator_t = &cx.toks.iterator_t;
let clone = &cx.toks.clone;
let vis = &cx.ast.vis;
let double_ended_iterator_t = &cx.toks.double_ended_iterator_t;

let option = cx.toks.option();
let iterator_t = cx.toks.iterator_t();
let clone_t = cx.toks.clone_t();
let double_ended_iterator_t = cx.toks.double_ended_iterator_t();

let mut step_forward = IteratorNext::default();
let mut step_backward = IteratorNextBack::default();
Expand All @@ -892,7 +911,7 @@ fn build_values_mut_impl(
..
} in field_specs
{
iter_clone.push(quote!(#name: #clone::clone(&self.#name)));
iter_clone.push(quote!(#name: #clone_t::clone(&self.#name)));

match kind {
FieldKind::Simple => {
Expand Down Expand Up @@ -994,10 +1013,11 @@ fn build_into_iter_impl(

let ident = &cx.ast.ident;
let vis = &cx.ast.vis;
let option = &cx.toks.option;
let clone = &cx.toks.clone;
let iterator_t = &cx.toks.iterator_t;
let double_ended_iterator_t = &cx.toks.double_ended_iterator_t;

let option = cx.toks.option();
let clone_t = cx.toks.clone_t();
let iterator_t = cx.toks.iterator_t();
let double_ended_iterator_t = cx.toks.double_ended_iterator_t();

let mut step_forward = IteratorNext::default();
let mut step_backward = IteratorNextBack::default();
Expand All @@ -1017,7 +1037,7 @@ fn build_into_iter_impl(
)?;

for FieldSpec { name, kind, .. } in field_specs {
field_clone.push(quote!(#name: #clone::clone(&self.#name)));
field_clone.push(quote!(#name: #clone_t::clone(&self.#name)));

match kind {
FieldKind::Simple => {
Expand All @@ -1031,7 +1051,7 @@ fn build_into_iter_impl(
} => {
field_decls.push(quote!(#name: #as_storage::IntoIter));
init.push(quote!(#name: #storage::into_iter(self.#name)));
clone_bounds.push(quote!(#as_storage::IntoIter: #clone));
clone_bounds.push(quote!(#as_storage::IntoIter: #clone_t));
}
}
}
Expand All @@ -1046,7 +1066,7 @@ fn build_into_iter_impl(
}

#[automatically_derived]
impl<V> #clone for #type_name<V> where V: Clone, #(#clone_bounds,)* {
impl<V> #clone_t for #type_name<V> where V: Clone, #(#clone_bounds,)* {
#[inline]
fn clone(&self) -> Self {
Self {
Expand Down Expand Up @@ -1143,14 +1163,15 @@ fn build_entry_impl(cx: &Ctxt<'_>, field_specs: &[FieldSpec<'_>]) -> Result<Toke
let ident = &cx.ast.ident;
let vis = &cx.ast.vis;
let lt = cx.lt;
let option = &cx.toks.option;
let storage_entry_trait = &cx.toks.storage_entry_trait;
let occupied_entry_trait = &cx.toks.occupied_entry_trait;
let vacant_entry_trait = &cx.toks.vacant_entry_trait;
let entry_enum = &cx.toks.entry_enum;
let option_bucket_option = &cx.toks.option_bucket_option;
let option_bucket_some = &cx.toks.option_bucket_some;
let option_bucket_none = &cx.toks.option_bucket_none;

let entry_enum = cx.toks.entry_enum();
let occupied_entry_trait = cx.toks.occupied_entry_t();
let option = cx.toks.option();
let option_bucket_none = cx.toks.option_bucket_none();
let option_bucket_option = cx.toks.option_bucket_option();
let option_bucket_some = cx.toks.option_bucket_some();
let storage_entry_trait = cx.toks.storage_entry_t();
let vacant_entry_trait = cx.toks.vacant_entry_t();

let mut init = Vec::new();
let mut occupied_variant = Vec::new();
Expand Down
Loading