diff options
author | Nick Fitzgerald <fitzgen@gmail.com> | 2017-10-12 11:36:21 -0700 |
---|---|---|
committer | Nick Fitzgerald <fitzgen@gmail.com> | 2017-10-12 11:36:21 -0700 |
commit | 1f15e605137edf34ec4ee239cbfc1bdee9fd0279 (patch) | |
tree | a7b6380e73194dddf96b54845cbe2f6fa029aadf /src/codegen/mod.rs | |
parent | fc63260b15f5732e172c391eded4ea1f6379ffb3 (diff) |
Rename `bitfield` to `bitfield_width`
Its more clear what the methods/fields are returning/storing when we add "width"
to the name.
Diffstat (limited to 'src/codegen/mod.rs')
-rw-r--r-- | src/codegen/mod.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs index 042373f3..d1ca904f 100644 --- a/src/codegen/mod.rs +++ b/src/codegen/mod.rs @@ -961,7 +961,7 @@ impl<'a> FieldCodegen<'a> for FieldData { { // Bitfields are handled by `FieldCodegen` implementations for // `BitfieldUnit` and `Bitfield`. - assert!(self.bitfield().is_none()); + assert!(self.bitfield_width().is_none()); let field_item = self.ty().into_resolver().through_type_refs().resolve(ctx); let field_ty = field_item.expect_type(); @@ -1166,7 +1166,7 @@ impl<'a> FieldCodegen<'a> for BitfieldUnit { } else { helpers::blob(self.layout()) }; - + let unit_field_name = format!("_bitfield_{}", self.nth()); let unit_field_ident = ctx.rust_ident(&unit_field_name); @@ -1656,8 +1656,8 @@ impl CodeGenerator for CompInfo { if item.can_derive_partialeq(ctx) { derives.push("PartialEq"); } else { - needs_partialeq_impl = - ctx.options().derive_partialeq && + needs_partialeq_impl = + ctx.options().derive_partialeq && ctx.options().impl_partialeq && ctx.lookup_can_derive_partialeq_or_partialord(item.id()) .map_or(true, |x| { @@ -1889,7 +1889,7 @@ impl CodeGenerator for CompInfo { if needs_partialeq_impl { if let Some(impl_) = impl_partialeq::gen_partialeq_impl(ctx, self, item, &ty_for_impl) { - + let partialeq_bounds = if !generic_param_names.is_empty() { let bounds = generic_param_names.iter().map(|t| { quote! { #t: PartialEq } |