diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-10-10 15:26:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-10 15:26:47 -0500 |
| commit | bd5f92867805fa4992b145ef4d820e28f3132ca7 (patch) | |
| tree | d3633e416a524b8a2db4d8cfa244d76a423629ae | |
| parent | ad6a73f7592ca4e6e363b35cf6a4c5a0d6c36fe4 (diff) | |
| parent | cb7495d2b318d0986229e53c04a2e975f9ec8f15 (diff) | |
Auto merge of #1071 - pepyakin:emit-hex-bitfield-masks, r=fitzgen
Emit hex bitfield masks
r? @fitzgen
24 files changed, 483 insertions, 476 deletions
diff --git a/src/codegen/helpers.rs b/src/codegen/helpers.rs index 9a8b0576..4ff398c4 100644 --- a/src/codegen/helpers.rs +++ b/src/codegen/helpers.rs @@ -143,6 +143,13 @@ pub mod ast_ty { tokens } + /// Returns hex representation of the given value. + pub fn hex_expr(val: u64) -> quote::Tokens { + let mut tokens = quote! {}; + tokens.append(format!("{:#x}", val)); + tokens + } + pub fn byte_array_expr(bytes: &[u8]) -> quote::Tokens { let mut bytes: Vec<_> = bytes.iter().cloned().collect(); bytes.push(0); diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs index 6d8e8a9d..694157d0 100644 --- a/src/codegen/mod.rs +++ b/src/codegen/mod.rs @@ -1121,7 +1121,7 @@ impl Bitfield { let bitfield_int_ty = helpers::blob(bitfield_ty_layout); let offset = self.offset_into_unit(); - let mask = self.mask(); + let mask = helpers::ast_ty::hex_expr(self.mask()); // Don't use variables or blocks because const functions do not allow // them. @@ -1304,7 +1304,7 @@ impl<'a> FieldCodegen<'a> for Bitfield { bitfield_ty.to_rust_ty_or_opaque(ctx, bitfield_ty_item); let offset = self.offset_into_unit(); - let mask = self.mask(); + let mask = helpers::ast_ty::hex_expr(self.mask()); methods.extend(Some(quote! { #[inline] diff --git a/tests/expectations/tests/bitfield-32bit-overflow.rs b/tests/expectations/tests/bitfield-32bit-overflow.rs index 9f7ea2e9..7b04efe2 100644 --- a/tests/expectations/tests/bitfield-32bit-overflow.rs +++ b/tests/expectations/tests/bitfield-32bit-overflow.rs @@ -39,13 +39,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 1u64 as u64; + let mask = 0x1 as u64; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m0(&mut self, val: ::std::os::raw::c_char) { - let mask = 1u64 as u64; + let mask = 0x1 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -75,13 +75,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 2u64 as u64; + let mask = 0x2 as u64; let val = (unit_field_val & mask) >> 1usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m1(&mut self, val: ::std::os::raw::c_char) { - let mask = 2u64 as u64; + let mask = 0x2 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -111,13 +111,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 4u64 as u64; + let mask = 0x4 as u64; let val = (unit_field_val & mask) >> 2usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m2(&mut self, val: ::std::os::raw::c_char) { - let mask = 4u64 as u64; + let mask = 0x4 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -147,13 +147,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 8u64 as u64; + let mask = 0x8 as u64; let val = (unit_field_val & mask) >> 3usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m3(&mut self, val: ::std::os::raw::c_char) { - let mask = 8u64 as u64; + let mask = 0x8 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -183,13 +183,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 16u64 as u64; + let mask = 0x10 as u64; let val = (unit_field_val & mask) >> 4usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m4(&mut self, val: ::std::os::raw::c_char) { - let mask = 16u64 as u64; + let mask = 0x10 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -219,13 +219,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 32u64 as u64; + let mask = 0x20 as u64; let val = (unit_field_val & mask) >> 5usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m5(&mut self, val: ::std::os::raw::c_char) { - let mask = 32u64 as u64; + let mask = 0x20 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -255,13 +255,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 64u64 as u64; + let mask = 0x40 as u64; let val = (unit_field_val & mask) >> 6usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m6(&mut self, val: ::std::os::raw::c_char) { - let mask = 64u64 as u64; + let mask = 0x40 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -291,13 +291,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 128u64 as u64; + let mask = 0x80 as u64; let val = (unit_field_val & mask) >> 7usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m7(&mut self, val: ::std::os::raw::c_char) { - let mask = 128u64 as u64; + let mask = 0x80 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -327,13 +327,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 256u64 as u64; + let mask = 0x100 as u64; let val = (unit_field_val & mask) >> 8usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m8(&mut self, val: ::std::os::raw::c_char) { - let mask = 256u64 as u64; + let mask = 0x100 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -363,13 +363,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 512u64 as u64; + let mask = 0x200 as u64; let val = (unit_field_val & mask) >> 9usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m9(&mut self, val: ::std::os::raw::c_char) { - let mask = 512u64 as u64; + let mask = 0x200 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -399,13 +399,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 1024u64 as u64; + let mask = 0x400 as u64; let val = (unit_field_val & mask) >> 10usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m10(&mut self, val: ::std::os::raw::c_char) { - let mask = 1024u64 as u64; + let mask = 0x400 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -435,13 +435,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 2048u64 as u64; + let mask = 0x800 as u64; let val = (unit_field_val & mask) >> 11usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m11(&mut self, val: ::std::os::raw::c_char) { - let mask = 2048u64 as u64; + let mask = 0x800 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -471,13 +471,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 4096u64 as u64; + let mask = 0x1000 as u64; let val = (unit_field_val & mask) >> 12usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m12(&mut self, val: ::std::os::raw::c_char) { - let mask = 4096u64 as u64; + let mask = 0x1000 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -507,13 +507,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 8192u64 as u64; + let mask = 0x2000 as u64; let val = (unit_field_val & mask) >> 13usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m13(&mut self, val: ::std::os::raw::c_char) { - let mask = 8192u64 as u64; + let mask = 0x2000 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -543,13 +543,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 16384u64 as u64; + let mask = 0x4000 as u64; let val = (unit_field_val & mask) >> 14usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m14(&mut self, val: ::std::os::raw::c_char) { - let mask = 16384u64 as u64; + let mask = 0x4000 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -579,13 +579,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 32768u64 as u64; + let mask = 0x8000 as u64; let val = (unit_field_val & mask) >> 15usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m15(&mut self, val: ::std::os::raw::c_char) { - let mask = 32768u64 as u64; + let mask = 0x8000 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -615,13 +615,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 65536u64 as u64; + let mask = 0x10000 as u64; let val = (unit_field_val & mask) >> 16usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m16(&mut self, val: ::std::os::raw::c_char) { - let mask = 65536u64 as u64; + let mask = 0x10000 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -651,13 +651,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 131072u64 as u64; + let mask = 0x20000 as u64; let val = (unit_field_val & mask) >> 17usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m17(&mut self, val: ::std::os::raw::c_char) { - let mask = 131072u64 as u64; + let mask = 0x20000 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -687,13 +687,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 262144u64 as u64; + let mask = 0x40000 as u64; let val = (unit_field_val & mask) >> 18usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m18(&mut self, val: ::std::os::raw::c_char) { - let mask = 262144u64 as u64; + let mask = 0x40000 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -723,13 +723,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 524288u64 as u64; + let mask = 0x80000 as u64; let val = (unit_field_val & mask) >> 19usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m19(&mut self, val: ::std::os::raw::c_char) { - let mask = 524288u64 as u64; + let mask = 0x80000 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -759,13 +759,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 1048576u64 as u64; + let mask = 0x100000 as u64; let val = (unit_field_val & mask) >> 20usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m20(&mut self, val: ::std::os::raw::c_char) { - let mask = 1048576u64 as u64; + let mask = 0x100000 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -795,13 +795,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 2097152u64 as u64; + let mask = 0x200000 as u64; let val = (unit_field_val & mask) >> 21usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m21(&mut self, val: ::std::os::raw::c_char) { - let mask = 2097152u64 as u64; + let mask = 0x200000 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -831,13 +831,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 4194304u64 as u64; + let mask = 0x400000 as u64; let val = (unit_field_val & mask) >> 22usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m22(&mut self, val: ::std::os::raw::c_char) { - let mask = 4194304u64 as u64; + let mask = 0x400000 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -867,13 +867,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 8388608u64 as u64; + let mask = 0x800000 as u64; let val = (unit_field_val & mask) >> 23usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m23(&mut self, val: ::std::os::raw::c_char) { - let mask = 8388608u64 as u64; + let mask = 0x800000 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -903,13 +903,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 16777216u64 as u64; + let mask = 0x1000000 as u64; let val = (unit_field_val & mask) >> 24usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m24(&mut self, val: ::std::os::raw::c_char) { - let mask = 16777216u64 as u64; + let mask = 0x1000000 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -939,13 +939,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 33554432u64 as u64; + let mask = 0x2000000 as u64; let val = (unit_field_val & mask) >> 25usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m25(&mut self, val: ::std::os::raw::c_char) { - let mask = 33554432u64 as u64; + let mask = 0x2000000 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -975,13 +975,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 67108864u64 as u64; + let mask = 0x4000000 as u64; let val = (unit_field_val & mask) >> 26usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m26(&mut self, val: ::std::os::raw::c_char) { - let mask = 67108864u64 as u64; + let mask = 0x4000000 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -1011,13 +1011,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 134217728u64 as u64; + let mask = 0x8000000 as u64; let val = (unit_field_val & mask) >> 27usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m27(&mut self, val: ::std::os::raw::c_char) { - let mask = 134217728u64 as u64; + let mask = 0x8000000 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -1047,13 +1047,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 268435456u64 as u64; + let mask = 0x10000000 as u64; let val = (unit_field_val & mask) >> 28usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m28(&mut self, val: ::std::os::raw::c_char) { - let mask = 268435456u64 as u64; + let mask = 0x10000000 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -1083,13 +1083,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 536870912u64 as u64; + let mask = 0x20000000 as u64; let val = (unit_field_val & mask) >> 29usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m29(&mut self, val: ::std::os::raw::c_char) { - let mask = 536870912u64 as u64; + let mask = 0x20000000 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -1119,13 +1119,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 1073741824u64 as u64; + let mask = 0x40000000 as u64; let val = (unit_field_val & mask) >> 30usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m30(&mut self, val: ::std::os::raw::c_char) { - let mask = 1073741824u64 as u64; + let mask = 0x40000000 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -1155,13 +1155,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 2147483648u64 as u64; + let mask = 0x80000000 as u64; let val = (unit_field_val & mask) >> 31usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m31(&mut self, val: ::std::os::raw::c_char) { - let mask = 2147483648u64 as u64; + let mask = 0x80000000 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -1191,13 +1191,13 @@ impl MuchBitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 4294967296u64 as u64; + let mask = 0x100000000 as u64; let val = (unit_field_val & mask) >> 32usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_m32(&mut self, val: ::std::os::raw::c_char) { - let mask = 4294967296u64 as u64; + let mask = 0x100000000 as u64; let val = val as u8 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -1253,38 +1253,38 @@ impl MuchBitfield { m31: ::std::os::raw::c_char, m32: ::std::os::raw::c_char, ) -> u64 { - (((((((((((((((((((((((((((((((((0 | ((m0 as u8 as u64) << 0usize) & (1u64 as u64)) | - ((m1 as u8 as u64) << 1usize) & (2u64 as u64)) | - ((m2 as u8 as u64) << 2usize) & (4u64 as u64)) | - ((m3 as u8 as u64) << 3usize) & (8u64 as u64)) | - ((m4 as u8 as u64) << 4usize) & (16u64 as u64)) | - ((m5 as u8 as u64) << 5usize) & (32u64 as u64)) | - ((m6 as u8 as u64) << 6usize) & (64u64 as u64)) | - ((m7 as u8 as u64) << 7usize) & (128u64 as u64)) | - ((m8 as u8 as u64) << 8usize) & (256u64 as u64)) | - ((m9 as u8 as u64) << 9usize) & (512u64 as u64)) | - ((m10 as u8 as u64) << 10usize) & (1024u64 as u64)) | - ((m11 as u8 as u64) << 11usize) & (2048u64 as u64)) | - ((m12 as u8 as u64) << 12usize) & (4096u64 as u64)) | - ((m13 as u8 as u64) << 13usize) & (8192u64 as u64)) | - ((m14 as u8 as u64) << 14usize) & (16384u64 as u64)) | - ((m15 as u8 as u64) << 15usize) & (32768u64 as u64)) | - ((m16 as u8 as u64) << 16usize) & (65536u64 as u64)) | - ((m17 as u8 as u64) << 17usize) & (131072u64 as u64)) | - ((m18 as u8 as u64) << 18usize) & (262144u64 as u64)) | - ((m19 as u8 as u64) << 19usize) & (524288u64 as u64)) | - ((m20 as u8 as u64) << 20usize) & (1048576u64 as u64)) | - ((m21 as u8 as u64) << 21usize) & (2097152u64 as u64)) | - ((m22 as u8 as u64) << 22usize) & (4194304u64 as u64)) | - ((m23 as u8 as u64) << 23usize) & (8388608u64 as u64)) | - ((m24 as u8 as u64) << 24usize) & (16777216u64 as u64)) | - ((m25 as u8 as u64) << 25usize) & (33554432u64 as u64)) | - ((m26 as u8 as u64) << 26usize) & (67108864u64 as u64)) | - ((m27 as u8 as u64) << 27usize) & (134217728u64 as u64)) | - ((m28 as u8 as u64) << 28usize) & (268435456u64 as u64)) | - ((m29 as u8 as u64) << 29usize) & (536870912u64 as u64)) | - ((m30 as u8 as u64) << 30usize) & (1073741824u64 as u64)) | - ((m31 as u8 as u64) << 31usize) & (2147483648u64 as u64)) | - ((m32 as u8 as u64) << 32usize) & (4294967296u64 as u64)) + (((((((((((((((((((((((((((((((((0 | ((m0 as u8 as u64) << 0usize) & (0x1 as u64)) + | ((m1 as u8 as u64) << 1usize) & (0x2 as u64)) + | ((m2 as u8 as u64) << 2usize) & (0x4 as u64)) + | ((m3 as u8 as u64) << 3usize) & (0x8 as u64)) + | ((m4 as u8 as u64) << 4usize) & (0x10 as u64)) + | ((m5 as u8 as u64) << 5usize) & (0x20 as u64)) + | ((m6 as u8 as u64) << 6usize) & (0x40 as u64)) + | ((m7 as u8 as u64) << 7usize) & (0x80 as u64)) + | ((m8 as u8 as u64) << 8usize) & (0x100 as u64)) + | ((m9 as u8 as u64) << 9usize) & (0x200 as u64)) + | ((m10 as u8 as u64) << 10usize) & (0x400 as u64)) + | ((m11 as u8 as u64) << 11usize) & (0x800 as u64)) + | ((m12 as u8 as u64) << 12usize) & (0x1000 as u64)) + | ((m13 as u8 as u64) << 13usize) & (0x2000 as u64)) + | ((m14 as u8 as u64) << 14usize) & (0x4000 as u64)) + | ((m15 as u8 as u64) << 15usize) & (0x8000 as u64)) + | ((m16 as u8 as u64) << 16usize) & (0x10000 as u64)) + | ((m17 as u8 as u64) << 17usize) & (0x20000 as u64)) + | ((m18 as u8 as u64) << 18usize) & (0x40000 as u64)) + | ((m19 as u8 as u64) << 19usize) & (0x80000 as u64)) + | ((m20 as u8 as u64) << 20usize) & (0x100000 as u64)) + | ((m21 as u8 as u64) << 21usize) & (0x200000 as u64)) + | ((m22 as u8 as u64) << 22usize) & (0x400000 as u64)) + | ((m23 as u8 as u64) << 23usize) & (0x800000 as u64)) + | ((m24 as u8 as u64) << 24usize) & (0x1000000 as u64)) + | ((m25 as u8 as u64) << 25usize) & (0x2000000 as u64)) + | ((m26 as u8 as u64) << 26usize) & (0x4000000 as u64)) + | ((m27 as u8 as u64) << 27usize) & (0x8000000 as u64)) + | ((m28 as u8 as u64) << 28usize) & (0x10000000 as u64)) + | ((m29 as u8 as u64) << 29usize) & (0x20000000 as u64)) + | ((m30 as u8 as u64) << 30usize) & (0x40000000 as u64)) + | ((m31 as u8 as u64) << 31usize) & (0x80000000 as u64)) + | ((m32 as u8 as u64) << 32usize) & (0x100000000 as u64)) } } diff --git a/tests/expectations/tests/bitfield-method-same-name.rs b/tests/expectations/tests/bitfield-method-same-name.rs index 7ddeb700..f61174a4 100644 --- a/tests/expectations/tests/bitfield-method-same-name.rs +++ b/tests/expectations/tests/bitfield-method-same-name.rs @@ -51,13 +51,13 @@ impl Foo { ::std::mem::size_of::<u8>(), ) }; - let mask = 7u64 as u8; + let mask = 0x7 as u8; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_type__bindgen_bitfield(&mut self, val: ::std::os::raw::c_char) { - let mask = 7u64 as u8; + let mask = 0x7 as u8; let val = val as u8 as u8; let mut unit_field_val: u8 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -79,7 +79,7 @@ impl Foo { } #[inline] pub fn new_bitfield_1(type__bindgen_bitfield: ::std::os::raw::c_char) -> u8 { - (0 | ((type__bindgen_bitfield as u8 as u8) << 0usize) & (7u64 as u8)) + (0 | ((type__bindgen_bitfield as u8 as u8) << 0usize) & (0x7 as u8)) } #[inline] pub unsafe fn type_(&mut self) -> ::std::os::raw::c_char { diff --git a/tests/expectations/tests/bitfield_align.rs b/tests/expectations/tests/bitfield_align.rs index 6479bb50..559f5a38 100644 --- a/tests/expectations/tests/bitfield_align.rs +++ b/tests/expectations/tests/bitfield_align.rs @@ -51,13 +51,13 @@ impl A { ::std::mem::size_of::<u16>(), ) }; - let mask = 1u64 as u16; + let mask = 0x1 as u16; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_b1(&mut self, val: ::std::os::raw::c_uint) { - let mask = 1u64 as u16; + let mask = 0x1 as u16; let val = val as u32 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -87,13 +87,13 @@ impl A { ::std::mem::size_of::<u16>(), ) }; - let mask = 2u64 as u16; + let mask = 0x2 as u16; let val = (unit_field_val & mask) >> 1usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_b2(&mut self, val: ::std::os::raw::c_uint) { - let mask = 2u64 as u16; + let mask = 0x2 as u16; let val = val as u32 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -123,13 +123,13 @@ impl A { ::std::mem::size_of::<u16>(), ) }; - let mask = 4u64 as u16; + let mask = 0x4 as u16; let val = (unit_field_val & mask) >> 2usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_b3(&mut self, val: ::std::os::raw::c_uint) { - let mask = 4u64 as u16; + let mask = 0x4 as u16; let val = val as u32 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -159,13 +159,13 @@ impl A { ::std::mem::size_of::<u16>(), ) }; - let mask = 8u64 as u16; + let mask = 0x8 as u16; let val = (unit_field_val & mask) >> 3usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_b4(&mut self, val: ::std::os::raw::c_uint) { - let mask = 8u64 as u16; + let mask = 0x8 as u16; let val = val as u32 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -195,13 +195,13 @@ impl A { ::std::mem::size_of::<u16>(), ) }; - let mask = 16u64 as u16; + let mask = 0x10 as u16; let val = (unit_field_val & mask) >> 4usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_b5(&mut self, val: ::std::os::raw::c_uint) { - let mask = 16u64 as u16; + let mask = 0x10 as u16; let val = val as u32 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -231,13 +231,13 @@ impl A { ::std::mem::size_of::<u16>(), ) }; - let mask = 32u64 as u16; + let mask = 0x20 as u16; let val = (unit_field_val & mask) >> 5usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_b6(&mut self, val: ::std::os::raw::c_uint) { - let mask = 32u64 as u16; + let mask = 0x20 as u16; let val = val as u32 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -267,13 +267,13 @@ impl A { ::std::mem::size_of::<u16>(), ) }; - let mask = 64u64 as u16; + let mask = 0x40 as u16; let val = (unit_field_val & mask) >> 6usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_b7(&mut self, val: ::std::os::raw::c_uint) { - let mask = 64u64 as u16; + let mask = 0x40 as u16; let val = val as u32 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -303,13 +303,13 @@ impl A { ::std::mem::size_of::<u16>(), ) }; - let mask = 128u64 as u16; + let mask = 0x80 as u16; let val = (unit_field_val & mask) >> 7usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_b8(&mut self, val: ::std::os::raw::c_uint) { - let mask = 128u64 as u16; + let mask = 0x80 as u16; let val = val as u32 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -339,13 +339,13 @@ impl A { ::std::mem::size_of::<u16>(), ) }; - let mask = 256u64 as u16; + let mask = 0x100 as u16; let val = (unit_field_val & mask) >> 8usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_b9(&mut self, val: ::std::os::raw::c_uint) { - let mask = 256u64 as u16; + let mask = 0x100 as u16; let val = val as u32 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -375,13 +375,13 @@ impl A { ::std::mem::size_of::<u16>(), ) }; - let mask = 512u64 as u16; + let mask = 0x200 as u16; let val = (unit_field_val & mask) >> 9usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_b10(&mut self, val: ::std::os::raw::c_uint) { - let mask = 512u64 as u16; + let mask = 0x200 as u16; let val = val as u32 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -414,16 +414,16 @@ impl A { b9: ::std::os::raw::c_uint, b10: ::std::os::raw::c_uint, ) -> u16 { - ((((((((((0 | ((b1 as u32 as u16) << 0usize) & (1u64 as u16)) | - ((b2 as u32 as u16) << 1usize) & (2u64 as u16)) | - ((b3 as u32 as u16) << 2usize) & (4u64 as u16)) | - ((b4 as u32 as u16) << 3usize) & (8u64 as u16)) | - ((b5 as u32 as u16) << 4usize) & (16u64 as u16)) | - ((b6 as u32 as u16) << 5usize) & (32u64 as u16)) | - ((b7 as u32 as u16) << 6usize) & (64u64 as u16)) | - ((b8 as u32 as u16) << 7usize) & (128u64 as u16)) | - ((b9 as u32 as u16) << 8usize) & (256u64 as u16)) | - ((b10 as u32 as u16) << 9usize) & (512u64 as u16)) + ((((((((((0 | ((b1 as u32 as u16) << 0usize) & (0x1 as u16)) + | ((b2 as u32 as u16) << 1usize) & (0x2 as u16)) + | ((b3 as u32 as u16) << 2usize) & (0x4 as u16)) + | ((b4 as u32 as u16) << 3usize) & (0x8 as u16)) + | ((b5 as u32 as u16) << 4usize) & (0x10 as u16)) + | ((b6 as u32 as u16) << 5usize) & (0x20 as u16)) + | ((b7 as u32 as u16) << 6usize) & (0x40 as u16)) + | ((b8 as u32 as u16) << 7usize) & (0x80 as u16)) + | ((b9 as u32 as u16) << 8usize) & (0x100 as u16)) + | ((b10 as u32 as u16) << 9usize) & (0x200 as u16)) } } #[repr(C)] @@ -461,13 +461,13 @@ impl B { ::std::mem::size_of::<u32>(), ) }; - let mask = 2147483647u64 as u32; + let mask = 0x7fffffff as u32; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_foo(&mut self, val: ::std::os::raw::c_uint) { - let mask = 2147483647u64 as u32; + let mask = 0x7fffffff as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -497,13 +497,13 @@ impl B { ::std::mem::size_of::<u32>(), ) }; - let mask = 2147483648u64 as u32; + let mask = 0x80000000 as u32; let val = (unit_field_val & mask) >> 31usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_bar(&mut self, val: ::std::os::raw::c_uchar) { - let mask = 2147483648u64 as u32; + let mask = 0x80000000 as u32; let val = val as u8 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -525,8 +525,8 @@ impl B { } #[inline] pub fn new_bitfield_1(foo: ::std::os::raw::c_uint, bar: ::std::os::raw::c_uchar) -> u32 { - ((0 | ((foo as u32 as u32) << 0usize) & (2147483647u64 as u32)) | - ((bar as u8 as u32) << 31usize) & (2147483648u64 as u32)) + ((0 | ((foo as u32 as u32) << 0usize) & (0x7fffffff as u32)) + | ((bar as u8 as u32) << 31usize) & (0x80000000 as u32)) } } #[repr(C)] @@ -575,13 +575,13 @@ impl C { ::std::mem::size_of::<u8>(), ) }; - let mask = 1u64 as u8; + let mask = 0x1 as u8; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_b1(&mut self, val: ::std::os::raw::c_uint) { - let mask = 1u64 as u8; + let mask = 0x1 as u8; let val = val as u32 as u8; let mut unit_field_val: u8 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -611,13 +611,13 @@ impl C { ::std::mem::size_of::<u8>(), ) }; - let mask = 2u64 as u8; + let mask = 0x2 as u8; let val = (unit_field_val & mask) >> 1usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_b2(&mut self, val: ::std::os::raw::c_uint) { - let mask = 2u64 as u8; + let mask = 0x2 as u8; let val = val as u32 as u8; let mut unit_field_val: u8 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -639,8 +639,8 @@ impl C { } #[inline] pub fn new_bitfield_1(b1: ::std::os::raw::c_uint, b2: ::std::os::raw::c_uint) -> u8 { - ((0 | ((b1 as u32 as u8) << 0usize) & (1u64 as u8)) | - ((b2 as u32 as u8) << 1usize) & (2u64 as u8)) + ((0 | ((b1 as u32 as u8) << 0usize) & (0x1 as u8)) + | ((b2 as u32 as u8) << 1usize) & (0x2 as u8)) } } #[repr(C)] @@ -679,13 +679,13 @@ impl Date1 { ::std::mem::size_of::<u32>(), ) }; - let mask = 7u64 as u32; + let mask = 0x7 as u32; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_nWeekDay(&mut self, val: ::std::os::raw::c_ushort) { - let mask = 7u64 as u32; + let mask = 0x7 as u32; let val = val as u16 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -715,13 +715,13 @@ impl Date1 { ::std::mem::size_of::<u32>(), ) }; - let mask = 504u64 as u32; + let mask = 0x1f8 as u32; let val = (unit_field_val & mask) >> 3usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_nMonthDay(&mut self, val: ::std::os::raw::c_ushort) { - let mask = 504u64 as u32; + let mask = 0x1f8 as u32; let val = val as u16 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -751,13 +751,13 @@ impl Date1 { ::std::mem::size_of::<u32>(), ) }; - let mask = 15872u64 as u32; + let mask = 0x3e00 as u32; let val = (unit_field_val & mask) >> 9usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_nMonth(&mut self, val: ::std::os::raw::c_ushort) { - let mask = 15872u64 as u32; + let mask = 0x3e00 as u32; let val = val as u16 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -787,13 +787,13 @@ impl Date1 { ::std::mem::size_of::<u32>(), ) }; - let mask = 16711680u64 as u32; + let mask = 0xff0000 as u32; let val = (unit_field_val & mask) >> 16usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_nYear(&mut self, val: ::std::os::raw::c_ushort) { - let mask = 16711680u64 as u32; + let mask = 0xff0000 as u32; let val = val as u16 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -820,10 +820,10 @@ impl Date1 { nMonth: ::std::os::raw::c_ushort, nYear: ::std::os::raw::c_ushort, ) -> u32 { - ((((0 | ((nWeekDay as u16 as u32) << 0usize) & (7u64 as u32)) | - ((nMonthDay as u16 as u32) << 3usize) & (504u64 as u32)) | - ((nMonth as u16 as u32) << 9usize) & (15872u64 as u32)) | - ((nYear as u16 as u32) << 16usize) & (16711680u64 as u32)) + ((((0 | ((nWeekDay as u16 as u32) << 0usize) & (0x7 as u32)) + | ((nMonthDay as u16 as u32) << 3usize) & (0x1f8 as u32)) + | ((nMonth as u16 as u32) << 9usize) & (0x3e00 as u32)) + | ((nYear as u16 as u32) << 16usize) & (0xff0000 as u32)) } } #[repr(C)] @@ -861,13 +861,13 @@ impl Date2 { ::std::mem::size_of::<u32>(), ) }; - let mask = 7u64 as u32; + let mask = 0x7 as u32; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_nWeekDay(&mut self, val: ::std::os::raw::c_ushort) { - let mask = 7u64 as u32; + let mask = 0x7 as u32; let val = val as u16 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -897,13 +897,13 @@ impl Date2 { ::std::mem::size_of::<u32>(), ) }; - let mask = 504u64 as u32; + let mask = 0x1f8 as u32; let val = (unit_field_val & mask) >> 3usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_nMonthDay(&mut self, val: ::std::os::raw::c_ushort) { - let mask = 504u64 as u32; + let mask = 0x1f8 as u32; let val = val as u16 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -933,13 +933,13 @@ impl Date2 { ::std::mem::size_of::<u32>(), ) }; - let mask = 15872u64 as u32; + let mask = 0x3e00 as u32; let val = (unit_field_val & mask) >> 9usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_nMonth(&mut self, val: ::std::os::raw::c_ushort) { - let mask = 15872u64 as u32; + let mask = 0x3e00 as u32; let val = val as u16 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -969,13 +969,13 @@ impl Date2 { ::std::mem::size_of::<u32>(), ) }; - let mask = 16711680u64 as u32; + let mask = 0xff0000 as u32; let val = (unit_field_val & mask) >> 16usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_nYear(&mut self, val: ::std::os::raw::c_ushort) { - let mask = 16711680u64 as u32; + let mask = 0xff0000 as u32; let val = val as u16 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -1005,13 +1005,13 @@ impl Date2 { ::std::mem::size_of::<u32>(), ) }; - let mask = 4278190080u64 as u32; + let mask = 0xff000000 as u32; let val = (unit_field_val & mask) >> 24usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_byte(&mut self, val: ::std::os::raw::c_uchar) { - let mask = 4278190080u64 as u32; + let mask = 0xff000000 as u32; let val = val as u8 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -1039,11 +1039,11 @@ impl Date2 { nYear: ::std::os::raw::c_ushort, byte: ::std::os::raw::c_uchar, ) -> u32 { - (((((0 | ((nWeekDay as u16 as u32) << 0usize) & (7u64 as u32)) | - ((nMonthDay as u16 as u32) << 3usize) & (504u64 as u32)) | - ((nMonth as u16 as u32) << 9usize) & (15872u64 as u32)) | - ((nYear as u16 as u32) << 16usize) & (16711680u64 as u32)) | - ((byte as u8 as u32) << 24usize) & (4278190080u64 as u32)) + (((((0 | ((nWeekDay as u16 as u32) << 0usize) & (0x7 as u32)) + | ((nMonthDay as u16 as u32) << 3usize) & (0x1f8 as u32)) + | ((nMonth as u16 as u32) << 9usize) & (0x3e00 as u32)) + | ((nYear as u16 as u32) << 16usize) & (0xff0000 as u32)) + | ((byte as u8 as u32) << 24usize) & (0xff000000 as u32)) } } #[repr(C)] @@ -1092,13 +1092,13 @@ impl Date3 { ::std::mem::size_of::<u32>(), ) }; - let mask = 7u64 as u32; + let mask = 0x7 as u32; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_nWeekDay(&mut self, val: ::std::os::raw::c_ushort) { - let mask = 7u64 as u32; + let mask = 0x7 as u32; let val = val as u16 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -1128,13 +1128,13 @@ impl Date3 { ::std::mem::size_of::<u32>(), ) }; - let mask = 504u64 as u32; + let mask = 0x1f8 as u32; let val = (unit_field_val & mask) >> 3usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_nMonthDay(&mut self, val: ::std::os::raw::c_ushort) { - let mask = 504u64 as u32; + let mask = 0x1f8 as u32; let val = val as u16 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -1164,13 +1164,13 @@ impl Date3 { ::std::mem::size_of::<u32>(), ) }; - let mask = 15872u64 as u32; + let mask = 0x3e00 as u32; let val = (unit_field_val & mask) >> 9usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_nMonth(&mut self, val: ::std::os::raw::c_ushort) { - let mask = 15872u64 as u32; + let mask = 0x3e00 as u32; let val = val as u16 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -1200,13 +1200,13 @@ impl Date3 { ::std::mem::size_of::<u32>(), ) }; - let mask = 16711680u64 as u32; + let mask = 0xff0000 as u32; let val = (unit_field_val & mask) >> 16usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_nYear(&mut self, val: ::std::os::raw::c_ushort) { - let mask = 16711680u64 as u32; + let mask = 0xff0000 as u32; let val = val as u16 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -1233,9 +1233,9 @@ impl Date3 { nMonth: ::std::os::raw::c_ushort, nYear: ::std::os::raw::c_ushort, ) -> u32 { - ((((0 | ((nWeekDay as u16 as u32) << 0usize) & (7u64 as u32)) | - ((nMonthDay as u16 as u32) << 3usize) & (504u64 as u32)) | - ((nMonth as u16 as u32) << 9usize) & (15872u64 as u32)) | - ((nYear as u16 as u32) << 16usize) & (16711680u64 as u32)) + ((((0 | ((nWeekDay as u16 as u32) << 0usize) & (0x7 as u32)) + | ((nMonthDay as u16 as u32) << 3usize) & (0x1f8 as u32)) + | ((nMonth as u16 as u32) << 9usize) & (0x3e00 as u32)) + | ((nYear as u16 as u32) << 16usize) & (0xff0000 as u32)) } } diff --git a/tests/expectations/tests/bitfield_align_2.rs b/tests/expectations/tests/bitfield_align_2.rs index d3ce64f8..d6df314c 100644 --- a/tests/expectations/tests/bitfield_align_2.rs +++ b/tests/expectations/tests/bitfield_align_2.rs @@ -52,13 +52,13 @@ impl TaggedPtr { ::std::mem::size_of::<u64>(), ) }; - let mask = 3u64 as u64; + let mask = 0x3 as u64; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_tag(&mut self, val: MyEnum) { - let mask = 3u64 as u64; + let mask = 0x3 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -88,13 +88,13 @@ impl TaggedPtr { ::std::mem::size_of::<u64>(), ) }; - let mask = 18446744073709551612u64 as u64; + let mask = 0xfffffffffffffffc as u64; let val = (unit_field_val & mask) >> 2usize; unsafe { ::std::mem::transmute(val as u64) } } #[inline] pub fn set_ptr(&mut self, val: ::std::os::raw::c_long) { - let mask = 18446744073709551612u64 as u64; + let mask = 0xfffffffffffffffc as u64; let val = val as u64 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -116,7 +116,7 @@ impl TaggedPtr { } #[inline] pub fn new_bitfield_1(tag: MyEnum, ptr: ::std::os::raw::c_long) -> u64 { - ((0 | ((tag as u32 as u64) << 0usize) & (3u64 as u64)) | - ((ptr as u64 as u64) << 2usize) & (18446744073709551612u64 as u64)) + ((0 | ((tag as u32 as u64) << 0usize) & (0x3 as u64)) + | ((ptr as u64 as u64) << 2usize) & (0xfffffffffffffffc as u64)) } } diff --git a/tests/expectations/tests/bitfield_method_mangling.rs b/tests/expectations/tests/bitfield_method_mangling.rs index 736d6360..a56e57f0 100644 --- a/tests/expectations/tests/bitfield_method_mangling.rs +++ b/tests/expectations/tests/bitfield_method_mangling.rs @@ -39,13 +39,13 @@ impl mach_msg_type_descriptor_t { ::std::mem::size_of::<u32>(), ) }; - let mask = 16777215u64 as u32; + let mask = 0xffffff as u32; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_pad3(&mut self, val: ::std::os::raw::c_uint) { - let mask = 16777215u64 as u32; + let mask = 0xffffff as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -75,13 +75,13 @@ impl mach_msg_type_descriptor_t { ::std::mem::size_of::<u32>(), ) }; - let mask = 4278190080u64 as u32; + let mask = 0xff000000 as u32; let val = (unit_field_val & mask) >> 24usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_type(&mut self, val: ::std::os::raw::c_uint) { - let mask = 4278190080u64 as u32; + let mask = 0xff000000 as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -103,7 +103,7 @@ impl mach_msg_type_descriptor_t { } #[inline] pub fn new_bitfield_1(pad3: ::std::os::raw::c_uint, type_: ::std::os::raw::c_uint) -> u32 { - ((0 | ((pad3 as u32 as u32) << 0usize) & (16777215u64 as u32)) | - ((type_ as u32 as u32) << 24usize) & (4278190080u64 as u32)) + ((0 | ((pad3 as u32 as u32) << 0usize) & (0xffffff as u32)) + | ((type_ as u32 as u32) << 24usize) & (0xff000000 as u32)) } } diff --git a/tests/expectations/tests/derive-bitfield-method-same-name.rs b/tests/expectations/tests/derive-bitfield-method-same-name.rs index 72b67e66..143a6ce4 100644 --- a/tests/expectations/tests/derive-bitfield-method-same-name.rs +++ b/tests/expectations/tests/derive-bitfield-method-same-name.rs @@ -91,13 +91,13 @@ impl Foo { ::std::mem::size_of::<u16>(), ) }; - let mask = 7u64 as u16; + let mask = 0x7 as u16; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_type__bindgen_bitfield(&mut self, val: ::std::os::raw::c_char) { - let mask = 7u64 as u16; + let mask = 0x7 as u16; let val = val as u8 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -119,7 +119,7 @@ impl Foo { } #[inline] pub fn new_bitfield_1(type__bindgen_bitfield: ::std::os::raw::c_char) -> u16 { - (0 | ((type__bindgen_bitfield as u8 as u16) << 0usize) & (7u64 as u16)) + (0 | ((type__bindgen_bitfield as u8 as u16) << 0usize) & (0x7 as u16)) } #[inline] pub unsafe fn type_(&mut self) -> ::std::os::raw::c_char { diff --git a/tests/expectations/tests/derive-debug-bitfield.rs b/tests/expectations/tests/derive-debug-bitfield.rs index 47ec570b..53fcf716 100644 --- a/tests/expectations/tests/derive-debug-bitfield.rs +++ b/tests/expectations/tests/derive-debug-bitfield.rs @@ -69,13 +69,13 @@ impl C { ::std::mem::size_of::<u8>(), ) }; - let mask = 1u64 as u8; + let mask = 0x1 as u8; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_a(&mut self, val: bool) { - let mask = 1u64 as u8; + let mask = 0x1 as u8; let val = val as u8 as u8; let mut unit_field_val: u8 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -105,13 +105,13 @@ impl C { ::std::mem::size_of::<u8>(), ) }; - let mask = 254u64 as u8; + let mask = 0xfe as u8; let val = (unit_field_val & mask) >> 1usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_b(&mut self, val: bool) { - let mask = 254u64 as u8; + let mask = 0xfe as u8; let val = val as u8 as u8; let mut unit_field_val: u8 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -133,7 +133,7 @@ impl C { } #[inline] pub fn new_bitfield_1(a: bool, b: bool) -> u8 { - ((0 | ((a as u8 as u8) << 0usize) & (1u64 as u8)) | - ((b as u8 as u8) << 1usize) & (254u64 as u8)) + ((0 | ((a as u8 as u8) << 0usize) & (0x1 as u8)) + | ((b as u8 as u8) << 1usize) & (0xfe as u8)) } } diff --git a/tests/expectations/tests/derive-partialeq-bitfield.rs b/tests/expectations/tests/derive-partialeq-bitfield.rs index b788f6c3..bc7e750e 100644 --- a/tests/expectations/tests/derive-partialeq-bitfield.rs +++ b/tests/expectations/tests/derive-partialeq-bitfield.rs @@ -45,8 +45,8 @@ impl Default for C { } impl ::std::cmp::PartialEq for C { fn eq(&self, other: &C) -> bool { - self.a() == other.a() && self.b() == other.b() && - &self.large_array[..] == &other.large_array[..] + self.a() == other.a() && self.b() == other.b() + && &self.large_array[..] == &other.large_array[..] } } impl C { @@ -60,13 +60,13 @@ impl C { ::std::mem::size_of::<u8>(), ) }; - let mask = 1u64 as u8; + let mask = 0x1 as u8; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_a(&mut self, val: bool) { - let mask = 1u64 as u8; + let mask = 0x1 as u8; let val = val as u8 as u8; let mut unit_field_val: u8 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -96,13 +96,13 @@ impl C { ::std::mem::size_of::<u8>(), ) }; - let mask = 254u64 as u8; + let mask = 0xfe as u8; let val = (unit_field_val & mask) >> 1usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_b(&mut self, val: bool) { - let mask = 254u64 as u8; + let mask = 0xfe as u8; let val = val as u8 as u8; let mut unit_field_val: u8 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -124,7 +124,7 @@ impl C { } #[inline] pub fn new_bitfield_1(a: bool, b: bool) -> u8 { - ((0 | ((a as u8 as u8) << 0usize) & (1u64 as u8)) | - ((b as u8 as u8) << 1usize) & (254u64 as u8)) + ((0 | ((a as u8 as u8) << 0usize) & (0x1 as u8)) + | ((b as u8 as u8) << 1usize) & (0xfe as u8)) } } diff --git a/tests/expectations/tests/jsval_layout_opaque.rs b/tests/expectations/tests/jsval_layout_opaque.rs index 2e93bb46..c8e01a0c 100644 --- a/tests/expectations/tests/jsval_layout_opaque.rs +++ b/tests/expectations/tests/jsval_layout_opaque.rs @@ -123,13 +123,13 @@ impl jsval_layout__bindgen_ty_1 { ::std::mem::size_of::<u64>(), ) }; - let mask = 140737488355327u64 as u64; + let mask = 0x7fffffffffff as u64; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u64) } } #[inline] pub fn set_payload47(&mut self, val: u64) { - let mask = 140737488355327u64 as u64; + let mask = 0x7fffffffffff as u64; let val = val as u64 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -159,13 +159,13 @@ impl jsval_layout__bindgen_ty_1 { ::std::mem::size_of::<u64>(), ) }; - let mask = 18446603336221196288u64 as u64; + let mask = 0xffff800000000000 as u64; let val = (unit_field_val & mask) >> 47usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_tag(&mut self, val: JSValueTag) { - let mask = 18446603336221196288u64 as u64; + let mask = 0xffff800000000000 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -187,8 +187,8 @@ impl jsval_layout__bindgen_ty_1 { } #[inline] pub fn new_bitfield_1(payload47: u64, tag: JSValueTag) -> u64 { - ((0 | ((payload47 as u64 as u64) << 0usize) & (140737488355327u64 as u64)) | - ((tag as u32 as u64) << 47usize) & (18446603336221196288u64 as u64)) + ((0 | ((payload47 as u64 as u64) << 0usize) & (0x7fffffffffff as u64)) + | ((tag as u32 as u64) << 47usize) & (0xffff800000000000 as u64)) } } #[repr(C)] diff --git a/tests/expectations/tests/jsval_layout_opaque_1_0.rs b/tests/expectations/tests/jsval_layout_opaque_1_0.rs index b818bf90..93a549c5 100644 --- a/tests/expectations/tests/jsval_layout_opaque_1_0.rs +++ b/tests/expectations/tests/jsval_layout_opaque_1_0.rs @@ -46,7 +46,7 @@ impl<T> ::std::cmp::PartialEq for __BindgenUnionField<T> { true } } -impl <T> ::std::cmp::Eq for __BindgenUnionField<T> { } +impl<T> ::std::cmp::Eq for __BindgenUnionField<T> {} pub const JSVAL_TAG_SHIFT: ::std::os::raw::c_uint = 47; pub const JSVAL_PAYLOAD_MASK: ::std::os::raw::c_ulonglong = 140737488355327; pub const JSVAL_TAG_MASK: ::std::os::raw::c_longlong = -140737488355328; @@ -166,13 +166,13 @@ impl jsval_layout__bindgen_ty_1 { ::std::mem::size_of::<u64>(), ) }; - let mask = 140737488355327u64 as u64; + let mask = 0x7fffffffffff as u64; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u64) } } #[inline] pub fn set_payload47(&mut self, val: u64) { - let mask = 140737488355327u64 as u64; + let mask = 0x7fffffffffff as u64; let val = val as u64 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -202,13 +202,13 @@ impl jsval_layout__bindgen_ty_1 { ::std::mem::size_of::<u64>(), ) }; - let mask = 18446603336221196288u64 as u64; + let mask = 0xffff800000000000 as u64; let val = (unit_field_val & mask) >> 47usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_tag(&mut self, val: JSValueTag) { - let mask = 18446603336221196288u64 as u64; + let mask = 0xffff800000000000 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -230,8 +230,8 @@ impl jsval_layout__bindgen_ty_1 { } #[inline] pub fn new_bitfield_1(payload47: u64, tag: JSValueTag) -> u64 { - ((0 | ((payload47 as u64 as u64) << 0usize) & (140737488355327u64 as u64)) | - ((tag as u32 as u64) << 47usize) & (18446603336221196288u64 as u64)) + ((0 | ((payload47 as u64 as u64) << 0usize) & (0x7fffffffffff as u64)) + | ((tag as u32 as u64) << 47usize) & (0xffff800000000000 as u64)) } } #[repr(C)] diff --git a/tests/expectations/tests/layout_align.rs b/tests/expectations/tests/layout_align.rs index 9e9ac872..9d883e37 100644 --- a/tests/expectations/tests/layout_align.rs +++ b/tests/expectations/tests/layout_align.rs @@ -122,13 +122,13 @@ impl rte_eth_link { ::std::mem::size_of::<u8>(), ) }; - let mask = 1u64 as u8; + let mask = 0x1 as u8; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_link_duplex(&mut self, val: u16) { - let mask = 1u64 as u8; + let mask = 0x1 as u8; let val = val as u16 as u8; let mut unit_field_val: u8 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -158,13 +158,13 @@ impl rte_eth_link { ::std::mem::size_of::<u8>(), ) }; - let mask = 2u64 as u8; + let mask = 0x2 as u8; let val = (unit_field_val & mask) >> 1usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_link_autoneg(&mut self, val: u16) { - let mask = 2u64 as u8; + let mask = 0x2 as u8; let val = val as u16 as u8; let mut unit_field_val: u8 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -194,13 +194,13 @@ impl rte_eth_link { ::std::mem::size_of::<u8>(), ) }; - let mask = 4u64 as u8; + let mask = 0x4 as u8; let val = (unit_field_val & mask) >> 2usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_link_status(&mut self, val: u16) { - let mask = 4u64 as u8; + let mask = 0x4 as u8; let val = val as u16 as u8; let mut unit_field_val: u8 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -222,8 +222,8 @@ impl rte_eth_link { } #[inline] pub fn new_bitfield_1(link_duplex: u16, link_autoneg: u16, link_status: u16) -> u8 { - (((0 | ((link_duplex as u16 as u8) << 0usize) & (1u64 as u8)) | - ((link_autoneg as u16 as u8) << 1usize) & (2u64 as u8)) | - ((link_status as u16 as u8) << 2usize) & (4u64 as u8)) + (((0 | ((link_duplex as u16 as u8) << 0usize) & (0x1 as u8)) + | ((link_autoneg as u16 as u8) << 1usize) & (0x2 as u8)) + | ((link_status as u16 as u8) << 2usize) & (0x4 as u8)) } } diff --git a/tests/expectations/tests/layout_eth_conf.rs b/tests/expectations/tests/layout_eth_conf.rs index 8c2889ba..5e17ec2a 100644 --- a/tests/expectations/tests/layout_eth_conf.rs +++ b/tests/expectations/tests/layout_eth_conf.rs @@ -126,13 +126,13 @@ impl rte_eth_rxmode { ::std::mem::size_of::<u16>(), ) }; - let mask = 1u64 as u16; + let mask = 0x1 as u16; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_header_split(&mut self, val: u16) { - let mask = 1u64 as u16; + let mask = 0x1 as u16; let val = val as u16 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -162,13 +162,13 @@ impl rte_eth_rxmode { ::std::mem::size_of::<u16>(), ) }; - let mask = 2u64 as u16; + let mask = 0x2 as u16; let val = (unit_field_val & mask) >> 1usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_hw_ip_checksum(&mut self, val: u16) { - let mask = 2u64 as u16; + let mask = 0x2 as u16; let val = val as u16 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -198,13 +198,13 @@ impl rte_eth_rxmode { ::std::mem::size_of::<u16>(), ) }; - let mask = 4u64 as u16; + let mask = 0x4 as u16; let val = (unit_field_val & mask) >> 2usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_hw_vlan_filter(&mut self, val: u16) { - let mask = 4u64 as u16; + let mask = 0x4 as u16; let val = val as u16 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -234,13 +234,13 @@ impl rte_eth_rxmode { ::std::mem::size_of::<u16>(), ) }; - let mask = 8u64 as u16; + let mask = 0x8 as u16; let val = (unit_field_val & mask) >> 3usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_hw_vlan_strip(&mut self, val: u16) { - let mask = 8u64 as u16; + let mask = 0x8 as u16; let val = val as u16 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -270,13 +270,13 @@ impl rte_eth_rxmode { ::std::mem::size_of::<u16>(), ) }; - let mask = 16u64 as u16; + let mask = 0x10 as u16; let val = (unit_field_val & mask) >> 4usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_hw_vlan_extend(&mut self, val: u16) { - let mask = 16u64 as u16; + let mask = 0x10 as u16; let val = val as u16 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -306,13 +306,13 @@ impl rte_eth_rxmode { ::std::mem::size_of::<u16>(), ) }; - let mask = 32u64 as u16; + let mask = 0x20 as u16; let val = (unit_field_val & mask) >> 5usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_jumbo_frame(&mut self, val: u16) { - let mask = 32u64 as u16; + let mask = 0x20 as u16; let val = val as u16 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -342,13 +342,13 @@ impl rte_eth_rxmode { ::std::mem::size_of::<u16>(), ) }; - let mask = 64u64 as u16; + let mask = 0x40 as u16; let val = (unit_field_val & mask) >> 6usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_hw_strip_crc(&mut self, val: u16) { - let mask = 64u64 as u16; + let mask = 0x40 as u16; let val = val as u16 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -378,13 +378,13 @@ impl rte_eth_rxmode { ::std::mem::size_of::<u16>(), ) }; - let mask = 128u64 as u16; + let mask = 0x80 as u16; let val = (unit_field_val & mask) >> 7usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_enable_scatter(&mut self, val: u16) { - let mask = 128u64 as u16; + let mask = 0x80 as u16; let val = val as u16 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -414,13 +414,13 @@ impl rte_eth_rxmode { ::std::mem::size_of::<u16>(), ) }; - let mask = 256u64 as u16; + let mask = 0x100 as u16; let val = (unit_field_val & mask) >> 8usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_enable_lro(&mut self, val: u16) { - let mask = 256u64 as u16; + let mask = 0x100 as u16; let val = val as u16 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -452,15 +452,15 @@ impl rte_eth_rxmode { enable_scatter: u16, enable_lro: u16, ) -> u16 { - (((((((((0 | ((header_split as u16 as u16) << 0usize) & (1u64 as u16)) | - ((hw_ip_checksum as u16 as u16) << 1usize) & (2u64 as u16)) | - ((hw_vlan_filter as u16 as u16) << 2usize) & (4u64 as u16)) | - ((hw_vlan_strip as u16 as u16) << 3usize) & (8u64 as u16)) | - ((hw_vlan_extend as u16 as u16) << 4usize) & (16u64 as u16)) | - ((jumbo_frame as u16 as u16) << 5usize) & (32u64 as u16)) | - ((hw_strip_crc as u16 as u16) << 6usize) & (64u64 as u16)) | - ((enable_scatter as u16 as u16) << 7usize) & (128u64 as u16)) | - ((enable_lro as u16 as u16) << 8usize) & (256u64 as u16)) + (((((((((0 | ((header_split as u16 as u16) << 0usize) & (0x1 as u16)) + | ((hw_ip_checksum as u16 as u16) << 1usize) & (0x2 as u16)) + | ((hw_vlan_filter as u16 as u16) << 2usize) & (0x4 as u16)) + | ((hw_vlan_strip as u16 as u16) << 3usize) & (0x8 as u16)) + | ((hw_vlan_extend as u16 as u16) << 4usize) & (0x10 as u16)) + | ((jumbo_frame as u16 as u16) << 5usize) & (0x20 as u16)) + | ((hw_strip_crc as u16 as u16) << 6usize) & (0x40 as u16)) + | ((enable_scatter as u16 as u16) << 7usize) & (0x80 as u16)) + | ((enable_lro as u16 as u16) << 8usize) & (0x100 as u16)) } } #[repr(u32)] @@ -537,13 +537,13 @@ impl rte_eth_txmode { ::std::mem::size_of::<u8>(), ) }; - let mask = 1u64 as u8; + let mask = 0x1 as u8; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_hw_vlan_reject_tagged(&mut self, val: u8) { - let mask = 1u64 as u8; + let mask = 0x1 as u8; let val = val as u8 as u8; let mut unit_field_val: u8 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -573,13 +573,13 @@ impl rte_eth_txmode { ::std::mem::size_of::<u8>(), ) }; - let mask = 2u64 as u8; + let mask = 0x2 as u8; let val = (unit_field_val & mask) >> 1usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_hw_vlan_reject_untagged(&mut self, val: u8) { - let mask = 2u64 as u8; + let mask = 0x2 as u8; let val = val as u8 as u8; let mut unit_field_val: u8 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -609,13 +609,13 @@ impl rte_eth_txmode { ::std::mem::size_of::<u8>(), ) }; - let mask = 4u64 as u8; + let mask = 0x4 as u8; let val = (unit_field_val & mask) >> 2usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_hw_vlan_insert_pvid(&mut self, val: u8) { - let mask = 4u64 as u8; + let mask = 0x4 as u8; let val = val as u8 as u8; let mut unit_field_val: u8 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -641,9 +641,9 @@ impl rte_eth_txmode { hw_vlan_reject_untagged: u8, hw_vlan_insert_pvid: u8, ) -> u8 { - (((0 | ((hw_vlan_reject_tagged as u8 as u8) << 0usize) & (1u64 as u8)) | - ((hw_vlan_reject_untagged as u8 as u8) << 1usize) & (2u64 as u8)) | - ((hw_vlan_insert_pvid as u8 as u8) << 2usize) & (4u64 as u8)) + (((0 | ((hw_vlan_reject_tagged as u8 as u8) << 0usize) & (0x1 as u8)) + | ((hw_vlan_reject_untagged as u8 as u8) << 1usize) & (0x2 as u8)) + | ((hw_vlan_insert_pvid as u8 as u8) << 2usize) & (0x4 as u8)) } } /// A structure used to configure the Receive Side Scaling (RSS) feature diff --git a/tests/expectations/tests/layout_eth_conf_1_0.rs b/tests/expectations/tests/layout_eth_conf_1_0.rs index 88e931b6..a35a9616 100644 --- a/tests/expectations/tests/layout_eth_conf_1_0.rs +++ b/tests/expectations/tests/layout_eth_conf_1_0.rs @@ -46,7 +46,7 @@ impl<T> ::std::cmp::PartialEq for __BindgenUnionField<T> { true } } -impl <T> ::std::cmp::Eq for __BindgenUnionField<T> { } +impl<T> ::std::cmp::Eq for __BindgenUnionField<T> {} pub const ETH_MQ_RX_RSS_FLAG: ::std::os::raw::c_uint = 1; pub const ETH_MQ_RX_DCB_FLAG: ::std::os::raw::c_uint = 2; pub const ETH_MQ_RX_VMDQ_FLAG: ::std::os::raw::c_uint = 4; @@ -169,13 +169,13 @@ impl rte_eth_rxmode { ::std::mem::size_of::<u16>(), ) }; - let mask = 1u64 as u16; + let mask = 0x1 as u16; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_header_split(&mut self, val: u16) { - let mask = 1u64 as u16; + let mask = 0x1 as u16; let val = val as u16 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -205,13 +205,13 @@ impl rte_eth_rxmode { ::std::mem::size_of::<u16>(), ) }; - let mask = 2u64 as u16; + let mask = 0x2 as u16; let val = (unit_field_val & mask) >> 1usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_hw_ip_checksum(&mut self, val: u16) { - let mask = 2u64 as u16; + let mask = 0x2 as u16; let val = val as u16 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -241,13 +241,13 @@ impl rte_eth_rxmode { ::std::mem::size_of::<u16>(), ) }; - let mask = 4u64 as u16; + let mask = 0x4 as u16; let val = (unit_field_val & mask) >> 2usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_hw_vlan_filter(&mut self, val: u16) { - let mask = 4u64 as u16; + let mask = 0x4 as u16; let val = val as u16 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -277,13 +277,13 @@ impl rte_eth_rxmode { ::std::mem::size_of::<u16>(), ) }; - let mask = 8u64 as u16; + let mask = 0x8 as u16; let val = (unit_field_val & mask) >> 3usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_hw_vlan_strip(&mut self, val: u16) { - let mask = 8u64 as u16; + let mask = 0x8 as u16; let val = val as u16 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -313,13 +313,13 @@ impl rte_eth_rxmode { ::std::mem::size_of::<u16>(), ) }; - let mask = 16u64 as u16; + let mask = 0x10 as u16; let val = (unit_field_val & mask) >> 4usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_hw_vlan_extend(&mut self, val: u16) { - let mask = 16u64 as u16; + let mask = 0x10 as u16; let val = val as u16 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -349,13 +349,13 @@ impl rte_eth_rxmode { ::std::mem::size_of::<u16>(), ) }; - let mask = 32u64 as u16; + let mask = 0x20 as u16; let val = (unit_field_val & mask) >> 5usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_jumbo_frame(&mut self, val: u16) { - let mask = 32u64 as u16; + let mask = 0x20 as u16; let val = val as u16 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -385,13 +385,13 @@ impl rte_eth_rxmode { ::std::mem::size_of::<u16>(), ) }; - let mask = 64u64 as u16; + let mask = 0x40 as u16; let val = (unit_field_val & mask) >> 6usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_hw_strip_crc(&mut self, val: u16) { - let mask = 64u64 as u16; + let mask = 0x40 as u16; let val = val as u16 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -421,13 +421,13 @@ impl rte_eth_rxmode { ::std::mem::size_of::<u16>(), ) }; - let mask = 128u64 as u16; + let mask = 0x80 as u16; let val = (unit_field_val & mask) >> 7usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_enable_scatter(&mut self, val: u16) { - let mask = 128u64 as u16; + let mask = 0x80 as u16; let val = val as u16 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -457,13 +457,13 @@ impl rte_eth_rxmode { ::std::mem::size_of::<u16>(), ) }; - let mask = 256u64 as u16; + let mask = 0x100 as u16; let val = (unit_field_val & mask) >> 8usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_enable_lro(&mut self, val: u16) { - let mask = 256u64 as u16; + let mask = 0x100 as u16; let val = val as u16 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -495,15 +495,15 @@ impl rte_eth_rxmode { enable_scatter: u16, enable_lro: u16, ) -> u16 { - (((((((((0 | ((header_split as u16 as u16) << 0usize) & (1u64 as u16)) | - ((hw_ip_checksum as u16 as u16) << 1usize) & (2u64 as u16)) | - ((hw_vlan_filter as u16 as u16) << 2usize) & (4u64 as u16)) | - ((hw_vlan_strip as u16 as u16) << 3usize) & (8u64 as u16)) | - ((hw_vlan_extend as u16 as u16) << 4usize) & (16u64 as u16)) | - ((jumbo_frame as u16 as u16) << 5usize) & (32u64 as u16)) | - ((hw_strip_crc as u16 as u16) << 6usize) & (64u64 as u16)) | - ((enable_scatter as u16 as u16) << 7usize) & (128u64 as u16)) | - ((enable_lro as u16 as u16) << 8usize) & (256u64 as u16)) + (((((((((0 | ((header_split as u16 as u16) << 0usize) & (0x1 as u16)) + | ((hw_ip_checksum as u16 as u16) << 1usize) & (0x2 as u16)) + | ((hw_vlan_filter as u16 as u16) << 2usize) & (0x4 as u16)) + | ((hw_vlan_strip as u16 as u16) << 3usize) & (0x8 as u16)) + | ((hw_vlan_extend as u16 as u16) << 4usize) & (0x10 as u16)) + | ((jumbo_frame as u16 as u16) << 5usize) & (0x20 as u16)) + | ((hw_strip_crc as u16 as u16) << 6usize) & (0x40 as u16)) + | ((enable_scatter as u16 as u16) << 7usize) & (0x80 as u16)) + | ((enable_lro as u16 as u16) << 8usize) & (0x100 as u16)) } } #[repr(u32)] @@ -580,13 +580,13 @@ impl rte_eth_txmode { ::std::mem::size_of::<u8>(), ) }; - let mask = 1u64 as u8; + let mask = 0x1 as u8; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_hw_vlan_reject_tagged(&mut self, val: u8) { - let mask = 1u64 as u8; + let mask = 0x1 as u8; let val = val as u8 as u8; let mut unit_field_val: u8 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -616,13 +616,13 @@ impl rte_eth_txmode { ::std::mem::size_of::<u8>(), ) }; - let mask = 2u64 as u8; + let mask = 0x2 as u8; let val = (unit_field_val & mask) >> 1usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_hw_vlan_reject_untagged(&mut self, val: u8) { - let mask = 2u64 as u8; + let mask = 0x2 as u8; let val = val as u8 as u8; let mut unit_field_val: u8 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -652,13 +652,13 @@ impl rte_eth_txmode { ::std::mem::size_of::<u8>(), ) }; - let mask = 4u64 as u8; + let mask = 0x4 as u8; let val = (unit_field_val & mask) >> 2usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_hw_vlan_insert_pvid(&mut self, val: u8) { - let mask = 4u64 as u8; + let mask = 0x4 as u8; let val = val as u8 as u8; let mut unit_field_val: u8 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -684,9 +684,9 @@ impl rte_eth_txmode { hw_vlan_reject_untagged: u8, hw_vlan_insert_pvid: u8, ) -> u8 { - (((0 | ((hw_vlan_reject_tagged as u8 as u8) << 0usize) & (1u64 as u8)) | - ((hw_vlan_reject_untagged as u8 as u8) << 1usize) & (2u64 as u8)) | - ((hw_vlan_insert_pvid as u8 as u8) << 2usize) & (4u64 as u8)) + (((0 | ((hw_vlan_reject_tagged as u8 as u8) << 0usize) & (0x1 as u8)) + | ((hw_vlan_reject_untagged as u8 as u8) << 1usize) & (0x2 as u8)) + | ((hw_vlan_insert_pvid as u8 as u8) << 2usize) & (0x4 as u8)) } } /// A structure used to configure the Receive Side Scaling (RSS) feature diff --git a/tests/expectations/tests/layout_mbuf.rs b/tests/expectations/tests/layout_mbuf.rs index a671db6c..90a367c6 100644 --- a/tests/expectations/tests/layout_mbuf.rs +++ b/tests/expectations/tests/layout_mbuf.rs @@ -199,13 +199,13 @@ impl rte_mbuf__bindgen_ty_2__bindgen_ty_1 { ::std::mem::size_of::<u32>(), ) }; - let mask = 15u64 as u32; + let mask = 0xf as u32; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_l2_type(&mut self, val: u32) { - let mask = 15u64 as u32; + let mask = 0xf as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -235,13 +235,13 @@ impl rte_mbuf__bindgen_ty_2__bindgen_ty_1 { ::std::mem::size_of::<u32>(), ) }; - let mask = 240u64 as u32; + let mask = 0xf0 as u32; let val = (unit_field_val & mask) >> 4usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_l3_type(&mut self, val: u32) { - let mask = 240u64 as u32; + let mask = 0xf0 as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -271,13 +271,13 @@ impl rte_mbuf__bindgen_ty_2__bindgen_ty_1 { ::std::mem::size_of::<u32>(), ) }; - let mask = 3840u64 as u32; + let mask = 0xf00 as u32; let val = (unit_field_val & mask) >> 8usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_l4_type(&mut self, val: u32) { - let mask = 3840u64 as u32; + let mask = 0xf00 as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -307,13 +307,13 @@ impl rte_mbuf__bindgen_ty_2__bindgen_ty_1 { ::std::mem::size_of::<u32>(), ) }; - let mask = 61440u64 as u32; + let mask = 0xf000 as u32; let val = (unit_field_val & mask) >> 12usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_tun_type(&mut self, val: u32) { - let mask = 61440u64 as u32; + let mask = 0xf000 as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -343,13 +343,13 @@ impl rte_mbuf__bindgen_ty_2__bindgen_ty_1 { ::std::mem::size_of::<u32>(), ) }; - let mask = 983040u64 as u32; + let mask = 0xf0000 as u32; let val = (unit_field_val & mask) >> 16usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_inner_l2_type(&mut self, val: u32) { - let mask = 983040u64 as u32; + let mask = 0xf0000 as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -379,13 +379,13 @@ impl rte_mbuf__bindgen_ty_2__bindgen_ty_1 { ::std::mem::size_of::<u32>(), ) }; - let mask = 15728640u64 as u32; + let mask = 0xf00000 as u32; let val = (unit_field_val & mask) >> 20usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_inner_l3_type(&mut self, val: u32) { - let mask = 15728640u64 as u32; + let mask = 0xf00000 as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -415,13 +415,13 @@ impl rte_mbuf__bindgen_ty_2__bindgen_ty_1 { ::std::mem::size_of::<u32>(), ) }; - let mask = 251658240u64 as u32; + let mask = 0xf000000 as u32; let val = (unit_field_val & mask) >> 24usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_inner_l4_type(&mut self, val: u32) { - let mask = 251658240u64 as u32; + let mask = 0xf000000 as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -451,13 +451,13 @@ impl rte_mbuf__bindgen_ty_2__bindgen_ty_1 { inner_l3_type: u32, inner_l4_type: u32, ) -> u32 { - (((((((0 | ((l2_type as u32 as u32) << 0usize) & (15u64 as u32)) | - ((l3_type as u32 as u32) << 4usize) & (240u64 as u32)) | - ((l4_type as u32 as u32) << 8usize) & (3840u64 as u32)) | - ((tun_type as u32 as u32) << 12usize) & (61440u64 as u32)) | - ((inner_l2_type as u32 as u32) << 16usize) & (983040u64 as u32)) | - ((inner_l3_type as u32 as u32) << 20usize) & (15728640u64 as u32)) | - ((inner_l4_type as u32 as u32) << 24usize) & (251658240u64 as u32)) + (((((((0 | ((l2_type as u32 as u32) << 0usize) & (0xf as u32)) + | ((l3_type as u32 as u32) << 4usize) & (0xf0 as u32)) + | ((l4_type as u32 as u32) << 8usize) & (0xf00 as u32)) + | ((tun_type as u32 as u32) << 12usize) & (0xf000 as u32)) + | ((inner_l2_type as u32 as u32) << 16usize) & (0xf0000 as u32)) + | ((inner_l3_type as u32 as u32) << 20usize) & (0xf00000 as u32)) + | ((inner_l4_type as u32 as u32) << 24usize) & (0xf000000 as u32)) } } #[test] @@ -545,8 +545,8 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindg ); assert_eq!( unsafe { - &(*(0 as *const rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1)) - .hash as *const _ as usize + &(*(0 as *const rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1)).hash + as *const _ as usize }, 0usize, concat!( @@ -558,8 +558,8 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindg ); assert_eq!( unsafe { - &(*(0 as *const rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1)).id as - *const _ as usize + &(*(0 as *const rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1)).id + as *const _ as usize }, 2usize, concat!( @@ -595,8 +595,8 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(0 as *const rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1)).lo as *const _ as - usize + &(*(0 as *const rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1)).lo as *const _ + as usize }, 0usize, concat!( @@ -870,13 +870,13 @@ impl rte_mbuf__bindgen_ty_5__bindgen_ty_1 { ::std::mem::size_of::<u64>(), ) }; - let mask = 127u64 as u64; + let mask = 0x7f as u64; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u64) } } #[inline] pub fn set_l2_len(&mut self, val: u64) { - let mask = 127u64 as u64; + let mask = 0x7f as u64; let val = val as u64 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -906,13 +906,13 @@ impl rte_mbuf__bindgen_ty_5__bindgen_ty_1 { ::std::mem::size_of::<u64>(), ) }; - let mask = 65408u64 as u64; + let mask = 0xff80 as u64; let val = (unit_field_val & mask) >> 7usize; unsafe { ::std::mem::transmute(val as u64) } } #[inline] pub fn set_l3_len(&mut self, val: u64) { - let mask = 65408u64 as u64; + let mask = 0xff80 as u64; let val = val as u64 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -942,13 +942,13 @@ impl rte_mbuf__bindgen_ty_5__bindgen_ty_1 { ::std::mem::size_of::<u64>(), ) }; - let mask = 16711680u64 as u64; + let mask = 0xff0000 as u64; let val = (unit_field_val & mask) >> 16usize; unsafe { ::std::mem::transmute(val as u64) } } #[inline] pub fn set_l4_len(&mut self, val: u64) { - let mask = 16711680u64 as u64; + let mask = 0xff0000 as u64; let val = val as u64 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -978,13 +978,13 @@ impl rte_mbuf__bindgen_ty_5__bindgen_ty_1 { ::std::mem::size_of::<u64>(), ) }; - let mask = 1099494850560u64 as u64; + let mask = 0xffff000000 as u64; let val = (unit_field_val & mask) >> 24usize; unsafe { ::std::mem::transmute(val as u64) } } #[inline] pub fn set_tso_segsz(&mut self, val: u64) { - let mask = 1099494850560u64 as u64; + let mask = 0xffff000000 as u64; let val = val as u64 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -1014,13 +1014,13 @@ impl rte_mbuf__bindgen_ty_5__bindgen_ty_1 { ::std::mem::size_of::<u64>(), ) }; - let mask = 561850441793536u64 as u64; + let mask = 0x1ff0000000000 as u64; let val = (unit_field_val & mask) >> 40usize; unsafe { ::std::mem::transmute(val as u64) } } #[inline] pub fn set_outer_l3_len(&mut self, val: u64) { - let mask = 561850441793536u64 as u64; + let mask = 0x1ff0000000000 as u64; let val = val as u64 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -1050,13 +1050,13 @@ impl rte_mbuf__bindgen_ty_5__bindgen_ty_1 { ::std::mem::size_of::<u64>(), ) }; - let mask = 71494644084506624u64 as u64; + let mask = 0xfe000000000000 as u64; let val = (unit_field_val & mask) >> 49usize; unsafe { ::std::mem::transmute(val as u64) } } #[inline] pub fn set_outer_l2_len(&mut self, val: u64) { - let mask = 71494644084506624u64 as u64; + let mask = 0xfe000000000000 as u64; let val = val as u64 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -1085,12 +1085,12 @@ impl rte_mbuf__bindgen_ty_5__bindgen_ty_1 { outer_l3_len: u64, outer_l2_len: u64, ) -> u64 { - ((((((0 | ((l2_len as u64 as u64) << 0usize) & (127u64 as u64)) | - ((l3_len as u64 as u64) << 7usize) & (65408u64 as u64)) | - ((l4_len as u64 as u64) << 16usize) & (16711680u64 as u64)) | - ((tso_segsz as u64 as u64) << 24usize) & (1099494850560u64 as u64)) | - ((outer_l3_len as u64 as u64) << 40usize) & (561850441793536u64 as u64)) | - ((outer_l2_len as u64 as u64) << 49usize) & (71494644084506624u64 as u64)) + ((((((0 | ((l2_len as u64 as u64) << 0usize) & (0x7f as u64)) + | ((l3_len as u64 as u64) << 7usize) & (0xff80 as u64)) + | ((l4_len as u64 as u64) << 16usize) & (0xff0000 as u64)) + | ((tso_segsz as u64 as u64) << 24usize) & (0xffff000000 as u64)) + | ((outer_l3_len as u64 as u64) << 40usize) & (0x1ff0000000000 as u64)) + | ((outer_l2_len as u64 as u64) << 49usize) & (0xfe000000000000 as u64)) } } #[test] diff --git a/tests/expectations/tests/layout_mbuf_1_0.rs b/tests/expectations/tests/layout_mbuf_1_0.rs index fe947a3a..256c8395 100644 --- a/tests/expectations/tests/layout_mbuf_1_0.rs +++ b/tests/expectations/tests/layout_mbuf_1_0.rs @@ -46,7 +46,7 @@ impl<T> ::std::cmp::PartialEq for __BindgenUnionField<T> { true } } -impl <T> ::std::cmp::Eq for __BindgenUnionField<T> { } +impl<T> ::std::cmp::Eq for __BindgenUnionField<T> {} pub const RTE_CACHE_LINE_MIN_SIZE: ::std::os::raw::c_uint = 64; pub const RTE_CACHE_LINE_SIZE: ::std::os::raw::c_uint = 64; pub type phys_addr_t = u64; @@ -237,13 +237,13 @@ impl rte_mbuf__bindgen_ty_2__bindgen_ty_1 { ::std::mem::size_of::<u32>(), ) }; - let mask = 15u64 as u32; + let mask = 0xf as u32; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_l2_type(&mut self, val: u32) { - let mask = 15u64 as u32; + let mask = 0xf as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -273,13 +273,13 @@ impl rte_mbuf__bindgen_ty_2__bindgen_ty_1 { ::std::mem::size_of::<u32>(), ) }; - let mask = 240u64 as u32; + let mask = 0xf0 as u32; let val = (unit_field_val & mask) >> 4usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_l3_type(&mut self, val: u32) { - let mask = 240u64 as u32; + let mask = 0xf0 as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -309,13 +309,13 @@ impl rte_mbuf__bindgen_ty_2__bindgen_ty_1 { ::std::mem::size_of::<u32>(), ) }; - let mask = 3840u64 as u32; + let mask = 0xf00 as u32; let val = (unit_field_val & mask) >> 8usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_l4_type(&mut self, val: u32) { - let mask = 3840u64 as u32; + let mask = 0xf00 as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -345,13 +345,13 @@ impl rte_mbuf__bindgen_ty_2__bindgen_ty_1 { ::std::mem::size_of::<u32>(), ) }; - let mask = 61440u64 as u32; + let mask = 0xf000 as u32; let val = (unit_field_val & mask) >> 12usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_tun_type(&mut self, val: u32) { - let mask = 61440u64 as u32; + let mask = 0xf000 as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -381,13 +381,13 @@ impl rte_mbuf__bindgen_ty_2__bindgen_ty_1 { ::std::mem::size_of::<u32>(), ) }; - let mask = 983040u64 as u32; + let mask = 0xf0000 as u32; let val = (unit_field_val & mask) >> 16usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_inner_l2_type(&mut self, val: u32) { - let mask = 983040u64 as u32; + let mask = 0xf0000 as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -417,13 +417,13 @@ impl rte_mbuf__bindgen_ty_2__bindgen_ty_1 { ::std::mem::size_of::<u32>(), ) }; - let mask = 15728640u64 as u32; + let mask = 0xf00000 as u32; let val = (unit_field_val & mask) >> 20usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_inner_l3_type(&mut self, val: u32) { - let mask = 15728640u64 as u32; + let mask = 0xf00000 as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -453,13 +453,13 @@ impl rte_mbuf__bindgen_ty_2__bindgen_ty_1 { ::std::mem::size_of::<u32>(), ) }; - let mask = 251658240u64 as u32; + let mask = 0xf000000 as u32; let val = (unit_field_val & mask) >> 24usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_inner_l4_type(&mut self, val: u32) { - let mask = 251658240u64 as u32; + let mask = 0xf000000 as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -489,13 +489,13 @@ impl rte_mbuf__bindgen_ty_2__bindgen_ty_1 { inner_l3_type: u32, inner_l4_type: u32, ) -> u32 { - (((((((0 | ((l2_type as u32 as u32) << 0usize) & (15u64 as u32)) | - ((l3_type as u32 as u32) << 4usize) & (240u64 as u32)) | - ((l4_type as u32 as u32) << 8usize) & (3840u64 as u32)) | - ((tun_type as u32 as u32) << 12usize) & (61440u64 as u32)) | - ((inner_l2_type as u32 as u32) << 16usize) & (983040u64 as u32)) | - ((inner_l3_type as u32 as u32) << 20usize) & (15728640u64 as u32)) | - ((inner_l4_type as u32 as u32) << 24usize) & (251658240u64 as u32)) + (((((((0 | ((l2_type as u32 as u32) << 0usize) & (0xf as u32)) + | ((l3_type as u32 as u32) << 4usize) & (0xf0 as u32)) + | ((l4_type as u32 as u32) << 8usize) & (0xf00 as u32)) + | ((tun_type as u32 as u32) << 12usize) & (0xf000 as u32)) + | ((inner_l2_type as u32 as u32) << 16usize) & (0xf0000 as u32)) + | ((inner_l3_type as u32 as u32) << 20usize) & (0xf00000 as u32)) + | ((inner_l4_type as u32 as u32) << 24usize) & (0xf000000 as u32)) } } #[test] @@ -579,8 +579,8 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindg ); assert_eq!( unsafe { - &(*(0 as *const rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1)) - .hash as *const _ as usize + &(*(0 as *const rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1)).hash + as *const _ as usize }, 0usize, concat!( @@ -592,8 +592,8 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindg ); assert_eq!( unsafe { - &(*(0 as *const rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1)).id as - *const _ as usize + &(*(0 as *const rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1__bindgen_ty_1)).id + as *const _ as usize }, 2usize, concat!( @@ -629,8 +629,8 @@ fn bindgen_test_layout_rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1() { ); assert_eq!( unsafe { - &(*(0 as *const rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1)).lo as *const _ as - usize + &(*(0 as *const rte_mbuf__bindgen_ty_3__bindgen_ty_1__bindgen_ty_1)).lo as *const _ + as usize }, 0usize, concat!( @@ -884,13 +884,13 @@ impl rte_mbuf__bindgen_ty_5__bindgen_ty_1 { ::std::mem::size_of::<u64>(), ) }; - let mask = 127u64 as u64; + let mask = 0x7f as u64; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u64) } } #[inline] pub fn set_l2_len(&mut self, val: u64) { - let mask = 127u64 as u64; + let mask = 0x7f as u64; let val = val as u64 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -920,13 +920,13 @@ impl rte_mbuf__bindgen_ty_5__bindgen_ty_1 { ::std::mem::size_of::<u64>(), ) }; - let mask = 65408u64 as u64; + let mask = 0xff80 as u64; let val = (unit_field_val & mask) >> 7usize; unsafe { ::std::mem::transmute(val as u64) } } #[inline] pub fn set_l3_len(&mut self, val: u64) { - let mask = 65408u64 as u64; + let mask = 0xff80 as u64; let val = val as u64 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -956,13 +956,13 @@ impl rte_mbuf__bindgen_ty_5__bindgen_ty_1 { ::std::mem::size_of::<u64>(), ) }; - let mask = 16711680u64 as u64; + let mask = 0xff0000 as u64; let val = (unit_field_val & mask) >> 16usize; unsafe { ::std::mem::transmute(val as u64) } } #[inline] pub fn set_l4_len(&mut self, val: u64) { - let mask = 16711680u64 as u64; + let mask = 0xff0000 as u64; let val = val as u64 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -992,13 +992,13 @@ impl rte_mbuf__bindgen_ty_5__bindgen_ty_1 { ::std::mem::size_of::<u64>(), ) }; - let mask = 1099494850560u64 as u64; + let mask = 0xffff000000 as u64; let val = (unit_field_val & mask) >> 24usize; unsafe { ::std::mem::transmute(val as u64) } } #[inline] pub fn set_tso_segsz(&mut self, val: u64) { - let mask = 1099494850560u64 as u64; + let mask = 0xffff000000 as u64; let val = val as u64 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -1028,13 +1028,13 @@ impl rte_mbuf__bindgen_ty_5__bindgen_ty_1 { ::std::mem::size_of::<u64>(), ) }; - let mask = 561850441793536u64 as u64; + let mask = 0x1ff0000000000 as u64; let val = (unit_field_val & mask) >> 40usize; unsafe { ::std::mem::transmute(val as u64) } } #[inline] pub fn set_outer_l3_len(&mut self, val: u64) { - let mask = 561850441793536u64 as u64; + let mask = 0x1ff0000000000 as u64; let val = val as u64 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -1064,13 +1064,13 @@ impl rte_mbuf__bindgen_ty_5__bindgen_ty_1 { ::std::mem::size_of::<u64>(), ) }; - let mask = 71494644084506624u64 as u64; + let mask = 0xfe000000000000 as u64; let val = (unit_field_val & mask) >> 49usize; unsafe { ::std::mem::transmute(val as u64) } } #[inline] pub fn set_outer_l2_len(&mut self, val: u64) { - let mask = 71494644084506624u64 as u64; + let mask = 0xfe000000000000 as u64; let val = val as u64 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -1099,12 +1099,12 @@ impl rte_mbuf__bindgen_ty_5__bindgen_ty_1 { outer_l3_len: u64, outer_l2_len: u64, ) -> u64 { - ((((((0 | ((l2_len as u64 as u64) << 0usize) & (127u64 as u64)) | - ((l3_len as u64 as u64) << 7usize) & (65408u64 as u64)) | - ((l4_len as u64 as u64) << 16usize) & (16711680u64 as u64)) | - ((tso_segsz as u64 as u64) << 24usize) & (1099494850560u64 as u64)) | - ((outer_l3_len as u64 as u64) << 40usize) & (561850441793536u64 as u64)) | - ((outer_l2_len as u64 as u64) << 49usize) & (71494644084506624u64 as u64)) + ((((((0 | ((l2_len as u64 as u64) << 0usize) & (0x7f as u64)) + | ((l3_len as u64 as u64) << 7usize) & (0xff80 as u64)) + | ((l4_len as u64 as u64) << 16usize) & (0xff0000 as u64)) + | ((tso_segsz as u64 as u64) << 24usize) & (0xffff000000 as u64)) + | ((outer_l3_len as u64 as u64) << 40usize) & (0x1ff0000000000 as u64)) + | ((outer_l2_len as u64 as u64) << 49usize) & (0xfe000000000000 as u64)) } } #[test] diff --git a/tests/expectations/tests/only_bitfields.rs b/tests/expectations/tests/only_bitfields.rs index 13fb00ba..97a62a8e 100644 --- a/tests/expectations/tests/only_bitfields.rs +++ b/tests/expectations/tests/only_bitfields.rs @@ -39,13 +39,13 @@ impl C { ::std::mem::size_of::<u8>(), ) }; - let mask = 1u64 as u8; + let mask = 0x1 as u8; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_a(&mut self, val: bool) { - let mask = 1u64 as u8; + let mask = 0x1 as u8; let val = val as u8 as u8; let mut unit_field_val: u8 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -75,13 +75,13 @@ impl C { ::std::mem::size_of::<u8>(), ) }; - let mask = 254u64 as u8; + let mask = 0xfe as u8; let val = (unit_field_val & mask) >> 1usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_b(&mut self, val: bool) { - let mask = 254u64 as u8; + let mask = 0xfe as u8; let val = val as u8 as u8; let mut unit_field_val: u8 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -103,7 +103,7 @@ impl C { } #[inline] pub fn new_bitfield_1(a: bool, b: bool) -> u8 { - ((0 | ((a as u8 as u8) << 0usize) & (1u64 as u8)) | - ((b as u8 as u8) << 1usize) & (254u64 as u8)) + ((0 | ((a as u8 as u8) << 0usize) & (0x1 as u8)) + | ((b as u8 as u8) << 1usize) & (0xfe as u8)) } } diff --git a/tests/expectations/tests/struct_with_bitfields.rs b/tests/expectations/tests/struct_with_bitfields.rs index 0581d4f2..fffb9380 100644 --- a/tests/expectations/tests/struct_with_bitfields.rs +++ b/tests/expectations/tests/struct_with_bitfields.rs @@ -50,13 +50,13 @@ impl bitfield { ::std::mem::size_of::<u8>(), ) }; - let mask = 1u64 as u8; + let mask = 0x1 as u8; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_a(&mut self, val: ::std::os::raw::c_ushort) { - let mask = 1u64 as u8; + let mask = 0x1 as u8; let val = val as u16 as u8; let mut unit_field_val: u8 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -86,13 +86,13 @@ impl bitfield { ::std::mem::size_of::<u8>(), ) }; - let mask = 2u64 as u8; + let mask = 0x2 as u8; let val = (unit_field_val & mask) >> 1usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_b(&mut self, val: ::std::os::raw::c_ushort) { - let mask = 2u64 as u8; + let mask = 0x2 as u8; let val = val as u16 as u8; let mut unit_field_val: u8 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -122,13 +122,13 @@ impl bitfield { ::std::mem::size_of::<u8>(), ) }; - let mask = 4u64 as u8; + let mask = 0x4 as u8; let val = (unit_field_val & mask) >> 2usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_c(&mut self, val: ::std::os::raw::c_ushort) { - let mask = 4u64 as u8; + let mask = 0x4 as u8; let val = val as u16 as u8; let mut unit_field_val: u8 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -158,13 +158,13 @@ impl bitfield { ::std::mem::size_of::<u8>(), ) }; - let mask = 192u64 as u8; + let mask = 0xc0 as u8; let val = (unit_field_val & mask) >> 6usize; unsafe { ::std::mem::transmute(val as u16) } } #[inline] pub fn set_d(&mut self, val: ::std::os::raw::c_ushort) { - let mask = 192u64 as u8; + let mask = 0xc0 as u8; let val = val as u16 as u8; let mut unit_field_val: u8 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -191,10 +191,10 @@ impl bitfield { c: ::std::os::raw::c_ushort, d: ::std::os::raw::c_ushort, ) -> u8 { - ((((0 | ((a as u16 as u8) << 0usize) & (1u64 as u8)) | - ((b as u16 as u8) << 1usize) & (2u64 as u8)) | - ((c as u16 as u8) << 2usize) & (4u64 as u8)) | - ((d as u16 as u8) << 6usize) & (192u64 as u8)) + ((((0 | ((a as u16 as u8) << 0usize) & (0x1 as u8)) + | ((b as u16 as u8) << 1usize) & (0x2 as u8)) + | ((c as u16 as u8) << 2usize) & (0x4 as u8)) + | ((d as u16 as u8) << 6usize) & (0xc0 as u8)) } #[inline] pub fn f(&self) -> ::std::os::raw::c_uint { @@ -206,13 +206,13 @@ impl bitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 3u64 as u64; + let mask = 0x3 as u64; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_f(&mut self, val: ::std::os::raw::c_uint) { - let mask = 3u64 as u64; + let mask = 0x3 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -242,13 +242,13 @@ impl bitfield { ::std::mem::size_of::<u64>(), ) }; - let mask = 18446744069414584320u64 as u64; + let mask = 0xffffffff00000000 as u64; let val = (unit_field_val & mask) >> 32usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_g(&mut self, val: ::std::os::raw::c_uint) { - let mask = 18446744069414584320u64 as u64; + let mask = 0xffffffff00000000 as u64; let val = val as u32 as u64; let mut unit_field_val: u64 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -270,7 +270,7 @@ impl bitfield { } #[inline] pub fn new_bitfield_2(f: ::std::os::raw::c_uint, g: ::std::os::raw::c_uint) -> u64 { - ((0 | ((f as u32 as u64) << 0usize) & (3u64 as u64)) | - ((g as u32 as u64) << 32usize) & (18446744069414584320u64 as u64)) + ((0 | ((f as u32 as u64) << 0usize) & (0x3 as u64)) + | ((g as u32 as u64) << 32usize) & (0xffffffff00000000 as u64)) } } diff --git a/tests/expectations/tests/union_bitfield.rs b/tests/expectations/tests/union_bitfield.rs index c67557ef..ad41435d 100644 --- a/tests/expectations/tests/union_bitfield.rs +++ b/tests/expectations/tests/union_bitfield.rs @@ -44,13 +44,13 @@ impl U4 { ::std::mem::size_of::<u8>(), ) }; - let mask = 1u64 as u8; + let mask = 0x1 as u8; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_derp(&mut self, val: ::std::os::raw::c_uint) { - let mask = 1u64 as u8; + let mask = 0x1 as u8; let val = val as u32 as u8; let mut unit_field_val: u8 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -72,7 +72,7 @@ impl U4 { } #[inline] pub fn new_bitfield_1(derp: ::std::os::raw::c_uint) -> u8 { - (0 | ((derp as u32 as u8) << 0usize) & (1u64 as u8)) + (0 | ((derp as u32 as u8) << 0usize) & (0x1 as u8)) } } #[repr(C)] @@ -115,13 +115,13 @@ impl B { ::std::mem::size_of::<u32>(), ) }; - let mask = 2147483647u64 as u32; + let mask = 0x7fffffff as u32; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_foo(&mut self, val: ::std::os::raw::c_uint) { - let mask = 2147483647u64 as u32; + let mask = 0x7fffffff as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -151,13 +151,13 @@ impl B { ::std::mem::size_of::<u32>(), ) }; - let mask = 2147483648u64 as u32; + let mask = 0x80000000 as u32; let val = (unit_field_val & mask) >> 31usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_bar(&mut self, val: ::std::os::raw::c_uchar) { - let mask = 2147483648u64 as u32; + let mask = 0x80000000 as u32; let val = val as u8 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -179,7 +179,7 @@ impl B { } #[inline] pub fn new_bitfield_1(foo: ::std::os::raw::c_uint, bar: ::std::os::raw::c_uchar) -> u32 { - ((0 | ((foo as u32 as u32) << 0usize) & (2147483647u64 as u32)) - | ((bar as u8 as u32) << 31usize) & (2147483648u64 as u32)) + ((0 | ((foo as u32 as u32) << 0usize) & (0x7fffffff as u32)) + | ((bar as u8 as u32) << 31usize) & (0x80000000 as u32)) } } diff --git a/tests/expectations/tests/union_bitfield_1_0.rs b/tests/expectations/tests/union_bitfield_1_0.rs index d8fe660c..4b7885d2 100644 --- a/tests/expectations/tests/union_bitfield_1_0.rs +++ b/tests/expectations/tests/union_bitfield_1_0.rs @@ -82,13 +82,13 @@ impl U4 { ::std::mem::size_of::<u8>(), ) }; - let mask = 1u64 as u8; + let mask = 0x1 as u8; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_derp(&mut self, val: ::std::os::raw::c_uint) { - let mask = 1u64 as u8; + let mask = 0x1 as u8; let val = val as u32 as u8; let mut unit_field_val: u8 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -110,7 +110,7 @@ impl U4 { } #[inline] pub fn new_bitfield_1(derp: ::std::os::raw::c_uint) -> u8 { - (0 | ((derp as u32 as u8) << 0usize) & (1u64 as u8)) + (0 | ((derp as u32 as u8) << 0usize) & (0x1 as u8)) } } #[repr(C)] @@ -148,13 +148,13 @@ impl B { ::std::mem::size_of::<u32>(), ) }; - let mask = 2147483647u64 as u32; + let mask = 0x7fffffff as u32; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_foo(&mut self, val: ::std::os::raw::c_uint) { - let mask = 2147483647u64 as u32; + let mask = 0x7fffffff as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -184,13 +184,13 @@ impl B { ::std::mem::size_of::<u32>(), ) }; - let mask = 2147483648u64 as u32; + let mask = 0x80000000 as u32; let val = (unit_field_val & mask) >> 31usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_bar(&mut self, val: ::std::os::raw::c_uchar) { - let mask = 2147483648u64 as u32; + let mask = 0x80000000 as u32; let val = val as u8 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -212,8 +212,8 @@ impl B { } #[inline] pub fn new_bitfield_1(foo: ::std::os::raw::c_uint, bar: ::std::os::raw::c_uchar) -> u32 { - ((0 | ((foo as u32 as u32) << 0usize) & (2147483647u64 as u32)) - | ((bar as u8 as u32) << 31usize) & (2147483648u64 as u32)) + ((0 | ((foo as u32 as u32) << 0usize) & (0x7fffffff as u32)) + | ((bar as u8 as u32) << 31usize) & (0x80000000 as u32)) } } #[repr(C)] diff --git a/tests/expectations/tests/union_with_anon_struct_bitfield.rs b/tests/expectations/tests/union_with_anon_struct_bitfield.rs index 3c903028..d759055b 100644 --- a/tests/expectations/tests/union_with_anon_struct_bitfield.rs +++ b/tests/expectations/tests/union_with_anon_struct_bitfield.rs @@ -46,13 +46,13 @@ impl foo__bindgen_ty_1 { ::std::mem::size_of::<u32>(), ) }; - let mask = 127u64 as u32; + let mask = 0x7f as u32; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_b(&mut self, val: ::std::os::raw::c_int) { - let mask = 127u64 as u32; + let mask = 0x7f as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -82,13 +82,13 @@ impl foo__bindgen_ty_1 { ::std::mem::size_of::<u32>(), ) }; - let mask = 4294967168u64 as u32; + let mask = 0xffffff80 as u32; let val = (unit_field_val & mask) >> 7usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_c(&mut self, val: ::std::os::raw::c_int) { - let mask = 4294967168u64 as u32; + let mask = 0xffffff80 as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -110,8 +110,8 @@ impl foo__bindgen_ty_1 { } #[inline] pub fn new_bitfield_1(b: ::std::os::raw::c_int, c: ::std::os::raw::c_int) -> u32 { - ((0 | ((b as u32 as u32) << 0usize) & (127u64 as u32)) | - ((c as u32 as u32) << 7usize) & (4294967168u64 as u32)) + ((0 | ((b as u32 as u32) << 0usize) & (0x7f as u32)) + | ((c as u32 as u32) << 7usize) & (0xffffff80 as u32)) } } #[test] diff --git a/tests/expectations/tests/union_with_anon_struct_bitfield_1_0.rs b/tests/expectations/tests/union_with_anon_struct_bitfield_1_0.rs index 2b5ffbac..803d6cde 100644 --- a/tests/expectations/tests/union_with_anon_struct_bitfield_1_0.rs +++ b/tests/expectations/tests/union_with_anon_struct_bitfield_1_0.rs @@ -46,7 +46,7 @@ impl<T> ::std::cmp::PartialEq for __BindgenUnionField<T> { true } } -impl <T> ::std::cmp::Eq for __BindgenUnionField<T> { } +impl<T> ::std::cmp::Eq for __BindgenUnionField<T> {} #[repr(C)] #[derive(Debug, Default, Copy, Hash, PartialEq, Eq)] pub struct foo { @@ -89,13 +89,13 @@ impl foo__bindgen_ty_1 { ::std::mem::size_of::<u32>(), ) }; - let mask = 127u64 as u32; + let mask = 0x7f as u32; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_b(&mut self, val: ::std::os::raw::c_int) { - let mask = 127u64 as u32; + let mask = 0x7f as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -125,13 +125,13 @@ impl foo__bindgen_ty_1 { ::std::mem::size_of::<u32>(), ) }; - let mask = 4294967168u64 as u32; + let mask = 0xffffff80 as u32; let val = (unit_field_val & mask) >> 7usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_c(&mut self, val: ::std::os::raw::c_int) { - let mask = 4294967168u64 as u32; + let mask = 0xffffff80 as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -153,8 +153,8 @@ impl foo__bindgen_ty_1 { } #[inline] pub fn new_bitfield_1(b: ::std::os::raw::c_int, c: ::std::os::raw::c_int) -> u32 { - ((0 | ((b as u32 as u32) << 0usize) & (127u64 as u32)) | - ((c as u32 as u32) << 7usize) & (4294967168u64 as u32)) + ((0 | ((b as u32 as u32) << 0usize) & (0x7f as u32)) + | ((c as u32 as u32) << 7usize) & (0xffffff80 as u32)) } } #[test] diff --git a/tests/expectations/tests/weird_bitfields.rs b/tests/expectations/tests/weird_bitfields.rs index 06f3af34..7a0b18c9 100644 --- a/tests/expectations/tests/weird_bitfields.rs +++ b/tests/expectations/tests/weird_bitfields.rs @@ -184,13 +184,13 @@ impl Weird { ::std::mem::size_of::<u32>(), ) }; - let mask = 65535u64 as u32; + let mask = 0xffff as u32; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_bitTest(&mut self, val: ::std::os::raw::c_uint) { - let mask = 65535u64 as u32; + let mask = 0xffff as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -220,13 +220,13 @@ impl Weird { ::std::mem::size_of::<u32>(), ) }; - let mask = 2147418112u64 as u32; + let mask = 0x7fff0000 as u32; let val = (unit_field_val & mask) >> 16usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_bitTest2(&mut self, val: ::std::os::raw::c_uint) { - let mask = 2147418112u64 as u32; + let mask = 0x7fff0000 as u32; let val = val as u32 as u32; let mut unit_field_val: u32 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -251,8 +251,8 @@ impl Weird { bitTest: ::std::os::raw::c_uint, bitTest2: ::std::os::raw::c_uint, ) -> u32 { - ((0 | ((bitTest as u32 as u32) << 0usize) & (65535u64 as u32)) | - ((bitTest2 as u32 as u32) << 16usize) & (2147418112u64 as u32)) + ((0 | ((bitTest as u32 as u32) << 0usize) & (0xffff as u32)) + | ((bitTest2 as u32 as u32) << 16usize) & (0x7fff0000 as u32)) } #[inline] pub fn mFillOpacitySource(&self) -> nsStyleSVGOpacitySource { @@ -264,13 +264,13 @@ impl Weird { ::std::mem::size_of::<u16>(), ) }; - let mask = 7u64 as u16; + let mask = 0x7 as u16; let val = (unit_field_val & mask) >> 0usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_mFillOpacitySource(&mut self, val: nsStyleSVGOpacitySource) { - let mask = 7u64 as u16; + let mask = 0x7 as u16; let val = val as u32 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -300,13 +300,13 @@ impl Weird { ::std::mem::size_of::<u16>(), ) }; - let mask = 56u64 as u16; + let mask = 0x38 as u16; let val = (unit_field_val & mask) >> 3usize; unsafe { ::std::mem::transmute(val as u32) } } #[inline] pub fn set_mStrokeOpacitySource(&mut self, val: nsStyleSVGOpacitySource) { - let mask = 56u64 as u16; + let mask = 0x38 as u16; let val = val as u32 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -336,13 +336,13 @@ impl Weird { ::std::mem::size_of::<u16>(), ) }; - let mask = 64u64 as u16; + let mask = 0x40 as u16; let val = (unit_field_val & mask) >> 6usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_mStrokeDasharrayFromObject(&mut self, val: bool) { - let mask = 64u64 as u16; + let mask = 0x40 as u16; let val = val as u8 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -372,13 +372,13 @@ impl Weird { ::std::mem::size_of::<u16>(), ) }; - let mask = 128u64 as u16; + let mask = 0x80 as u16; let val = (unit_field_val & mask) >> 7usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_mStrokeDashoffsetFromObject(&mut self, val: bool) { - let mask = 128u64 as u16; + let mask = 0x80 as u16; let val = val as u8 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -408,13 +408,13 @@ impl Weird { ::std::mem::size_of::<u16>(), ) }; - let mask = 256u64 as u16; + let mask = 0x100 as u16; let val = (unit_field_val & mask) >> 8usize; unsafe { ::std::mem::transmute(val as u8) } } #[inline] pub fn set_mStrokeWidthFromObject(&mut self, val: bool) { - let mask = 256u64 as u16; + let mask = 0x100 as u16; let val = val as u8 as u16; let mut unit_field_val: u16 = unsafe { ::std::mem::uninitialized() }; unsafe { @@ -442,10 +442,10 @@ impl Weird { mStrokeDashoffsetFromObject: bool, mStrokeWidthFromObject: bool, ) -> u16 { - (((((0 | ((mFillOpacitySource as u32 as u16) << 0usize) & (7u64 as u16)) | - ((mStrokeOpacitySource as u32 as u16) << 3usize) & (56u64 as u16)) | - ((mStrokeDasharrayFromObject as u8 as u16) << 6usize) & (64u64 as u16)) | - ((mStrokeDashoffsetFromObject as u8 as u16) << 7usize) & (128u64 as u16)) | - ((mStrokeWidthFromObject as u8 as u16) << 8usize) & (256u64 as u16)) + (((((0 | ((mFillOpacitySource as u32 as u16) << 0usize) & (0x7 as u16)) + | ((mStrokeOpacitySource as u32 as u16) << 3usize) & (0x38 as u16)) + | ((mStrokeDasharrayFromObject as u8 as u16) << 6usize) & (0x40 as u16)) + | ((mStrokeDashoffsetFromObject as u8 as u16) << 7usize) & (0x80 as u16)) + | ((mStrokeWidthFromObject as u8 as u16) << 8usize) & (0x100 as u16)) } } |