Auto merge of #1078 - fitzgen:bitfield-width, r=pepyakin

Rename `bitfield` to `bitfield_width`

Its more clear what the methods/fields are returning/storing when we add "width"
to the name.

r? @pepyakin

Author: bors-servo

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 }

src/ir/comp.rs

@@ -118,7 +118,7 @@ pub trait FieldMethods {
     fn comment(&self) -> Option<&str>;
 
     /// If this is a bitfield, how many bits does it need?
-    fn bitfield(&self) -> Option<u32>;
+    fn bitfield_width(&self) -> Option<u32>;
 
     /// Is this field marked as `mutable`?
     fn is_mutable(&self) -> bool;
@@ -295,20 +295,20 @@ pub struct Bitfield {
     data: FieldData,
 
     /// Name of the generated Rust getter for this bitfield.
-    /// 
+    ///
     /// Should be assigned before codegen.
     getter_name: Option<String>,
 
     /// Name of the generated Rust setter for this bitfield.
-    /// 
+    ///
     /// Should be assigned before codegen.
     setter_name: Option<String>,
 }
 
 impl Bitfield {
     /// Construct a new bitfield.
     fn new(offset_into_unit: usize, raw: RawField) -> Bitfield {
-        assert!(raw.bitfield().is_some());
+        assert!(raw.bitfield_width().is_some());
 
         Bitfield {
             offset_into_unit: offset_into_unit,
@@ -342,12 +342,12 @@ impl Bitfield {
 
     /// Get the bit width of this bitfield.
     pub fn width(&self) -> u32 {
-        self.data.bitfield().unwrap()
+        self.data.bitfield_width().unwrap()
     }
 
     /// Name of the generated Rust getter for this bitfield.
-    /// 
-    /// Panics if called before assigning bitfield accessor names or if 
+    ///
+    /// Panics if called before assigning bitfield accessor names or if
     /// this bitfield have no name.
     pub fn getter_name(&self) -> &str {
         assert!(self.name().is_some(), "`Bitfield::getter_name` called on anonymous field");
@@ -358,8 +358,8 @@ impl Bitfield {
     }
 
     /// Name of the generated Rust setter for this bitfield.
-    /// 
-    /// Panics if called before assigning bitfield accessor names or if 
+    ///
+    /// Panics if called before assigning bitfield accessor names or if
     /// this bitfield have no name.
     pub fn setter_name(&self) -> &str {
         assert!(self.name().is_some(), "`Bitfield::setter_name` called on anonymous field");
@@ -383,8 +383,8 @@ impl FieldMethods for Bitfield {
         self.data.comment()
     }
 
-    fn bitfield(&self) -> Option<u32> {
-        self.data.bitfield()
+    fn bitfield_width(&self) -> Option<u32> {
+        self.data.bitfield_width()
     }
 
     fn is_mutable(&self) -> bool {
@@ -415,7 +415,7 @@ impl RawField {
         ty: TypeId,
         comment: Option<String>,
         annotations: Option<Annotations>,
-        bitfield: Option<u32>,
+        bitfield_width: Option<u32>,
         mutable: bool,
         offset: Option<usize>,
     ) -> RawField {
@@ -424,7 +424,7 @@ impl RawField {
             ty: ty,
             comment: comment,
             annotations: annotations.unwrap_or_default(),
-            bitfield: bitfield,
+            bitfield_width: bitfield_width,
             mutable: mutable,
             offset: offset,
         })
@@ -444,8 +444,8 @@ impl FieldMethods for RawField {
         self.0.comment()
     }
 
-    fn bitfield(&self) -> Option<u32> {
-        self.0.bitfield()
+    fn bitfield_width(&self) -> Option<u32> {
+        self.0.bitfield_width()
     }
 
     fn is_mutable(&self) -> bool {
@@ -481,7 +481,7 @@ where
         {
             let non_bitfields = raw_fields
                 .by_ref()
-                .peeking_take_while(|f| f.bitfield().is_none())
+                .peeking_take_while(|f| f.bitfield_width().is_none())
                 .map(|f| Field::DataMember(f.0));
             fields.extend(non_bitfields);
         }
@@ -491,7 +491,7 @@ where
         // the Itanium C++ ABI.
         let mut bitfields = raw_fields
             .by_ref()
-            .peeking_take_while(|f| f.bitfield().is_some())
+            .peeking_take_while(|f| f.bitfield_width().is_some())
             .peekable();
 
         if bitfields.peek().is_none() {
@@ -569,7 +569,7 @@ fn bitfields_to_allocation_units<E, I>(
     const is_ms_struct: bool = false;
 
     for bitfield in raw_bitfields {
-        let bitfield_width = bitfield.bitfield().unwrap() as usize;
+        let bitfield_width = bitfield.bitfield_width().unwrap() as usize;
         let bitfield_layout = ctx.resolve_type(bitfield.ty())
             .layout(ctx)
             .expect("Bitfield without layout? Gah!");
@@ -813,7 +813,7 @@ pub struct FieldData {
     annotations: Annotations,
 
     /// If this field is a bitfield, and how many bits does it contain if it is.
-    bitfield: Option<u32>,
+    bitfield_width: Option<u32>,
 
     /// If the C++ field is marked as `mutable`
     mutable: bool,
@@ -835,8 +835,8 @@ impl FieldMethods for FieldData {
         self.comment.as_ref().map(|c| &**c)
     }
 
-    fn bitfield(&self) -> Option<u32> {
-        self.bitfield
+    fn bitfield_width(&self) -> Option<u32> {
+        self.bitfield_width
     }
 
     fn is_mutable(&self) -> bool {