-
Notifications
You must be signed in to change notification settings - Fork 691
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.
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
Derive partialeq "manually" when possible #1012
Merged
bors-servo
merged 4 commits into
rust-lang:master
from
pepyakin:derive-partialeq-manually
Oct 2, 2017
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
|
|
||
| use ir::comp::{CompInfo, CompKind, Field, FieldMethods}; | ||
| use ir::context::BindgenContext; | ||
| use ir::item::{IsOpaque, Item}; | ||
| use ir::ty::{TypeKind, RUST_DERIVE_IN_ARRAY_LIMIT}; | ||
| use quote; | ||
|
|
||
| /// Generate a manual implementation of `PartialEq` trait for the | ||
| /// specified compound type. | ||
| pub fn gen_partialeq_impl( | ||
| ctx: &BindgenContext, | ||
| comp_info: &CompInfo, | ||
| item: &Item, | ||
| ty_for_impl: "e::Tokens, | ||
| ) -> Option<quote::Tokens> { | ||
| let mut tokens = vec![]; | ||
|
|
||
| if item.is_opaque(ctx, &()) { | ||
| tokens.push(quote! { | ||
| &self._bindgen_opaque_blob[..] == &other._bindgen_opaque_blob[..] | ||
| }); | ||
| } else if comp_info.kind() == CompKind::Union { | ||
| assert!(!ctx.options().rust_features().untagged_union()); | ||
| tokens.push(quote! { | ||
| &self.bindgen_union_field[..] == &other.bindgen_union_field[..] | ||
| }); | ||
| } else { | ||
| for base in comp_info.base_members().iter() { | ||
| if !base.requires_storage(ctx) { | ||
| continue; | ||
| } | ||
|
|
||
| let ty_item = ctx.resolve_item(base.ty); | ||
| let field_name = &base.field_name; | ||
|
|
||
| if ty_item.is_opaque(ctx, &()) { | ||
| let field_name = ctx.rust_ident(field_name); | ||
| tokens.push(quote! { | ||
| &self. #field_name [..] == &other. #field_name [..] | ||
| }); | ||
| } else { | ||
| tokens.push(gen_field(ctx, ty_item, field_name)); | ||
| } | ||
| } | ||
|
|
||
| for field in comp_info.fields() { | ||
| match *field { | ||
| Field::DataMember(ref fd) => { | ||
| let ty_item = ctx.resolve_item(fd.ty()); | ||
| let name = fd.name().unwrap(); | ||
| tokens.push(gen_field(ctx, ty_item, name)); | ||
| } | ||
| Field::Bitfields(ref bu) => for bitfield in bu.bitfields() { | ||
| let name_ident = ctx.rust_ident_raw(bitfield.name()); | ||
| tokens.push(quote! { | ||
| self.#name_ident () == other.#name_ident () | ||
| }); | ||
| }, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Some(quote! { | ||
| fn eq(&self, other: & #ty_for_impl) -> bool { | ||
| #( #tokens )&&* | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| fn gen_field(ctx: &BindgenContext, ty_item: &Item, name: &str) -> quote::Tokens { | ||
| fn quote_equals(name_ident: quote::Ident) -> quote::Tokens { | ||
| quote! { self.#name_ident == other.#name_ident } | ||
| } | ||
|
|
||
| let name_ident = ctx.rust_ident(name); | ||
| let ty = ty_item.expect_type(); | ||
|
|
||
| match *ty.kind() { | ||
| TypeKind::Void | | ||
| TypeKind::NullPtr | | ||
| TypeKind::Int(..) | | ||
| TypeKind::Complex(..) | | ||
| TypeKind::Float(..) | | ||
| TypeKind::Enum(..) | | ||
| TypeKind::TypeParam | | ||
| TypeKind::UnresolvedTypeRef(..) | | ||
| TypeKind::BlockPointer | | ||
| TypeKind::Reference(..) | | ||
| TypeKind::ObjCInterface(..) | | ||
| TypeKind::ObjCId | | ||
| TypeKind::ObjCSel | | ||
| TypeKind::Comp(..) | | ||
| TypeKind::Pointer(_) | | ||
| TypeKind::Function(..) | | ||
| TypeKind::Opaque => quote_equals(name_ident), | ||
|
|
||
| TypeKind::TemplateInstantiation(ref inst) => { | ||
| if inst.is_opaque(ctx, &ty_item) { | ||
| quote! { | ||
| &self. #name_ident [..] == &other. #name_ident [..] | ||
| } | ||
| } else { | ||
| quote_equals(name_ident) | ||
| } | ||
| } | ||
|
|
||
| TypeKind::Array(_, len) => if len <= RUST_DERIVE_IN_ARRAY_LIMIT { | ||
| quote_equals(name_ident) | ||
| } else { | ||
| quote! { | ||
| &self. #name_ident [..] == &other. #name_ident [..] | ||
| } | ||
| }, | ||
|
|
||
| TypeKind::ResolvedTypeRef(t) | | ||
| TypeKind::TemplateAlias(t, _) | | ||
| TypeKind::Alias(t) => { | ||
| let inner_item = ctx.resolve_item(t); | ||
| gen_field(ctx, inner_item, name) | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice, we don't even need a loop ;)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was inspired by rustc itself (Just looked how it handles cases below 32 😄 )