Auto merge of #1343 - emilio:fixup, r=upsuper
codegen: Allow unused_mut to prevent warnings on little-endian machines.
And fixup whitespace.
This is a followup #1342.
diff --git a/Cargo.lock b/Cargo.lock
index 3670ade..4c7fa57 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -23,7 +23,7 @@
[[package]]
name = "bindgen"
-version = "0.37.3"
+version = "0.37.4"
dependencies = [
"cexpr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/Cargo.toml b/Cargo.toml
index bdd5874..bfbafea 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@
repository = "https://github.com/rust-lang-nursery/rust-bindgen"
documentation = "https://docs.rs/bindgen"
homepage = "https://rust-lang-nursery.github.io/rust-bindgen/"
-version = "0.37.3"
+version = "0.37.4"
build = "build.rs"
include = [
diff --git a/src/codegen/bitfield_unit.rs b/src/codegen/bitfield_unit.rs
index 5256be0..7f263fd 100755
--- a/src/codegen/bitfield_unit.rs
+++ b/src/codegen/bitfield_unit.rs
@@ -27,12 +27,13 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index =
+ if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -45,14 +46,14 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index =
+ if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -70,12 +71,12 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index =
+ if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -92,12 +93,12 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index =
+ if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/bitfield-32bit-overflow.rs b/tests/expectations/tests/bitfield-32bit-overflow.rs
index 224062f..905c726 100644
--- a/tests/expectations/tests/bitfield-32bit-overflow.rs
+++ b/tests/expectations/tests/bitfield-32bit-overflow.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/bitfield-large.rs b/tests/expectations/tests/bitfield-large.rs
index 4f8bc17..1a0dbdb 100644
--- a/tests/expectations/tests/bitfield-large.rs
+++ b/tests/expectations/tests/bitfield-large.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/bitfield-method-same-name.rs b/tests/expectations/tests/bitfield-method-same-name.rs
index 81678b6..8dda453 100644
--- a/tests/expectations/tests/bitfield-method-same-name.rs
+++ b/tests/expectations/tests/bitfield-method-same-name.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/bitfield_align.rs b/tests/expectations/tests/bitfield_align.rs
index 0b28a3f..0600052 100644
--- a/tests/expectations/tests/bitfield_align.rs
+++ b/tests/expectations/tests/bitfield_align.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/bitfield_align_2.rs b/tests/expectations/tests/bitfield_align_2.rs
index 7def5eb..7f5f689 100644
--- a/tests/expectations/tests/bitfield_align_2.rs
+++ b/tests/expectations/tests/bitfield_align_2.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/bitfield_method_mangling.rs b/tests/expectations/tests/bitfield_method_mangling.rs
index f0fafe8..d778dd9 100644
--- a/tests/expectations/tests/bitfield_method_mangling.rs
+++ b/tests/expectations/tests/bitfield_method_mangling.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/derive-bitfield-method-same-name.rs b/tests/expectations/tests/derive-bitfield-method-same-name.rs
index 4316866..5f5ac02 100644
--- a/tests/expectations/tests/derive-bitfield-method-same-name.rs
+++ b/tests/expectations/tests/derive-bitfield-method-same-name.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/derive-debug-bitfield.rs b/tests/expectations/tests/derive-debug-bitfield.rs
index a231c64..e56631b 100644
--- a/tests/expectations/tests/derive-debug-bitfield.rs
+++ b/tests/expectations/tests/derive-debug-bitfield.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/derive-partialeq-bitfield.rs b/tests/expectations/tests/derive-partialeq-bitfield.rs
index e707ca7..c1cb18f 100644
--- a/tests/expectations/tests/derive-partialeq-bitfield.rs
+++ b/tests/expectations/tests/derive-partialeq-bitfield.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/divide-by-zero-in-struct-layout.rs b/tests/expectations/tests/divide-by-zero-in-struct-layout.rs
index f0a6e7b..1b51a30 100644
--- a/tests/expectations/tests/divide-by-zero-in-struct-layout.rs
+++ b/tests/expectations/tests/divide-by-zero-in-struct-layout.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/issue-1034.rs b/tests/expectations/tests/issue-1034.rs
index ea8626a..957360b 100644
--- a/tests/expectations/tests/issue-1034.rs
+++ b/tests/expectations/tests/issue-1034.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/issue-1076-unnamed-bitfield-alignment.rs b/tests/expectations/tests/issue-1076-unnamed-bitfield-alignment.rs
index b283759..14eb4d5 100644
--- a/tests/expectations/tests/issue-1076-unnamed-bitfield-alignment.rs
+++ b/tests/expectations/tests/issue-1076-unnamed-bitfield-alignment.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/issue-739-pointer-wide-bitfield.rs b/tests/expectations/tests/issue-739-pointer-wide-bitfield.rs
index 4a488c2..7697660 100644
--- a/tests/expectations/tests/issue-739-pointer-wide-bitfield.rs
+++ b/tests/expectations/tests/issue-739-pointer-wide-bitfield.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/issue-816.rs b/tests/expectations/tests/issue-816.rs
index f2dd5be..b1a0308 100644
--- a/tests/expectations/tests/issue-816.rs
+++ b/tests/expectations/tests/issue-816.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/jsval_layout_opaque.rs b/tests/expectations/tests/jsval_layout_opaque.rs
index 27de430..6a03de6 100644
--- a/tests/expectations/tests/jsval_layout_opaque.rs
+++ b/tests/expectations/tests/jsval_layout_opaque.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/jsval_layout_opaque_1_0.rs b/tests/expectations/tests/jsval_layout_opaque_1_0.rs
index 145a58e..844d9f5 100644
--- a/tests/expectations/tests/jsval_layout_opaque_1_0.rs
+++ b/tests/expectations/tests/jsval_layout_opaque_1_0.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/layout_align.rs b/tests/expectations/tests/layout_align.rs
index a101820..71ba76f 100644
--- a/tests/expectations/tests/layout_align.rs
+++ b/tests/expectations/tests/layout_align.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/layout_eth_conf.rs b/tests/expectations/tests/layout_eth_conf.rs
index 9fb9e9c..c78d4db 100644
--- a/tests/expectations/tests/layout_eth_conf.rs
+++ b/tests/expectations/tests/layout_eth_conf.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/layout_eth_conf_1_0.rs b/tests/expectations/tests/layout_eth_conf_1_0.rs
index 98dd4bf..b20a74d 100644
--- a/tests/expectations/tests/layout_eth_conf_1_0.rs
+++ b/tests/expectations/tests/layout_eth_conf_1_0.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/layout_mbuf.rs b/tests/expectations/tests/layout_mbuf.rs
index 7911b78..0dbc362 100644
--- a/tests/expectations/tests/layout_mbuf.rs
+++ b/tests/expectations/tests/layout_mbuf.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/layout_mbuf_1_0.rs b/tests/expectations/tests/layout_mbuf_1_0.rs
index 485d82f..0bfcc13 100644
--- a/tests/expectations/tests/layout_mbuf_1_0.rs
+++ b/tests/expectations/tests/layout_mbuf_1_0.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/only_bitfields.rs b/tests/expectations/tests/only_bitfields.rs
index 7a512ed..13713ed 100644
--- a/tests/expectations/tests/only_bitfields.rs
+++ b/tests/expectations/tests/only_bitfields.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/struct_with_bitfields.rs b/tests/expectations/tests/struct_with_bitfields.rs
index 7f3887b..7abd108 100644
--- a/tests/expectations/tests/struct_with_bitfields.rs
+++ b/tests/expectations/tests/struct_with_bitfields.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/union_bitfield.rs b/tests/expectations/tests/union_bitfield.rs
index e8d11b5..0f884bf 100644
--- a/tests/expectations/tests/union_bitfield.rs
+++ b/tests/expectations/tests/union_bitfield.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/union_bitfield_1_0.rs b/tests/expectations/tests/union_bitfield_1_0.rs
index 2d3b125..b33d987 100644
--- a/tests/expectations/tests/union_bitfield_1_0.rs
+++ b/tests/expectations/tests/union_bitfield_1_0.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/union_with_anon_struct_bitfield.rs b/tests/expectations/tests/union_with_anon_struct_bitfield.rs
index c82d333..f598624 100644
--- a/tests/expectations/tests/union_with_anon_struct_bitfield.rs
+++ b/tests/expectations/tests/union_with_anon_struct_bitfield.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
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 737e98d..29ba59f 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
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
diff --git a/tests/expectations/tests/weird_bitfields.rs b/tests/expectations/tests/weird_bitfields.rs
index e872600..5bedcad 100644
--- a/tests/expectations/tests/weird_bitfields.rs
+++ b/tests/expectations/tests/weird_bitfields.rs
@@ -28,12 +28,12 @@
let byte_index = index / 8;
let byte = self.storage.as_ref()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+
let mask = 1 << bit_index;
byte & mask == mask
@@ -46,14 +46,13 @@
let byte_index = index / 8;
let byte = &mut self.storage.as_mut()[byte_index];
- let mut bit_index = index % 8;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- bit_index = 7 - bit_index;
- }
- let mask = 1 << bit_index;
+ let bit_index = if cfg!(target_endian = "big") {
+ 7 - (index % 8)
+ } else {
+ index % 8
+ };
+ let mask = 1 << bit_index;
if val {
*byte |= mask;
} else {
@@ -71,12 +70,11 @@
for i in 0..(bit_width as usize) {
if self.get_bit(i + bit_offset) {
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
val |= 1 << index;
}
}
@@ -93,12 +91,11 @@
for i in 0..(bit_width as usize) {
let mask = 1 << i;
let val_bit_is_set = val & mask == mask;
- let mut index = i;
- #[cfg(target_endian = "big")]
- {
- // Adjust the index for endianness.
- index = bit_width as usize - 1 - index;
- }
+ let index = if cfg!(target_endian = "big") {
+ bit_width as usize - 1 - i
+ } else {
+ i
+ };
self.set_bit(index + bit_offset, val_bit_is_set);
}
}
