Auto merge of #1343 - emilio:fixup, r=upsuperv0.37.4

 codegen: Allow unused_mut to prevent warnings on little-endian machines.

And fixup whitespace.

This is a followup #1342.

31 files changed, 644 insertions, 727 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 3670ade4..4c7fa57d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -23,7 +23,7 @@ dependencies = [
 
 [[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 bdd5874b..bfbafea3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@ readme = "README.md"
 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 5256be07..7f263fd1 100755
--- a/src/codegen/bitfield_unit.rs
+++ b/src/codegen/bitfield_unit.rs
@@ -27,12 +27,13 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 224062fa..905c7268 100644
--- a/tests/expectations/tests/bitfield-32bit-overflow.rs
+++ b/tests/expectations/tests/bitfield-32bit-overflow.rs
@@ -28,12 +28,12 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 4f8bc177..1a0dbdb4 100644
--- a/tests/expectations/tests/bitfield-large.rs
+++ b/tests/expectations/tests/bitfield-large.rs
@@ -28,12 +28,12 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 81678b68..8dda4538 100644
--- a/tests/expectations/tests/bitfield-method-same-name.rs
+++ b/tests/expectations/tests/bitfield-method-same-name.rs
@@ -28,12 +28,12 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 0b28a3fa..0600052b 100644
--- a/tests/expectations/tests/bitfield_align.rs
+++ b/tests/expectations/tests/bitfield_align.rs
@@ -28,12 +28,12 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 7def5ebf..7f5f689d 100644
--- a/tests/expectations/tests/bitfield_align_2.rs
+++ b/tests/expectations/tests/bitfield_align_2.rs
@@ -28,12 +28,12 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 f0fafe8f..d778dd9b 100644
--- a/tests/expectations/tests/bitfield_method_mangling.rs
+++ b/tests/expectations/tests/bitfield_method_mangling.rs
@@ -28,12 +28,12 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 43168660..5f5ac028 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 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 a231c643..e56631bb 100644
--- a/tests/expectations/tests/derive-debug-bitfield.rs
+++ b/tests/expectations/tests/derive-debug-bitfield.rs
@@ -28,12 +28,12 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 e707ca77..c1cb18f7 100644
--- a/tests/expectations/tests/derive-partialeq-bitfield.rs
+++ b/tests/expectations/tests/derive-partialeq-bitfield.rs
@@ -28,12 +28,12 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 f0a6e7b0..1b51a30f 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 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 ea8626a5..957360b7 100644
--- a/tests/expectations/tests/issue-1034.rs
+++ b/tests/expectations/tests/issue-1034.rs
@@ -28,12 +28,12 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 b2837592..14eb4d5f 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 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 4a488c21..7697660d 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 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 f2dd5be7..b1a03081 100644
--- a/tests/expectations/tests/issue-816.rs
+++ b/tests/expectations/tests/issue-816.rs
@@ -28,12 +28,12 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 27de4301..6a03de65 100644
--- a/tests/expectations/tests/jsval_layout_opaque.rs
+++ b/tests/expectations/tests/jsval_layout_opaque.rs
@@ -28,12 +28,12 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 145a58e7..844d9f5a 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 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 a101820d..71ba76fb 100644
--- a/tests/expectations/tests/layout_align.rs
+++ b/tests/expectations/tests/layout_align.rs
@@ -28,12 +28,12 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 9fb9e9c7..c78d4db7 100644
--- a/tests/expectations/tests/layout_eth_conf.rs
+++ b/tests/expectations/tests/layout_eth_conf.rs
@@ -28,12 +28,12 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 98dd4bf9..b20a74d8 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 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 7911b78d..0dbc362f 100644
--- a/tests/expectations/tests/layout_mbuf.rs
+++ b/tests/expectations/tests/layout_mbuf.rs
@@ -28,12 +28,12 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 485d82f8..0bfcc13e 100644
--- a/tests/expectations/tests/layout_mbuf_1_0.rs
+++ b/tests/expectations/tests/layout_mbuf_1_0.rs
@@ -28,12 +28,12 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 7a512ed5..13713ed2 100644
--- a/tests/expectations/tests/only_bitfields.rs
+++ b/tests/expectations/tests/only_bitfields.rs
@@ -28,12 +28,12 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 7f3887b4..7abd1087 100644
--- a/tests/expectations/tests/struct_with_bitfields.rs
+++ b/tests/expectations/tests/struct_with_bitfields.rs
@@ -28,12 +28,12 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 e8d11b59..0f884bfc 100644
--- a/tests/expectations/tests/union_bitfield.rs
+++ b/tests/expectations/tests/union_bitfield.rs
@@ -28,12 +28,12 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 2d3b1257..b33d9873 100644
--- a/tests/expectations/tests/union_bitfield_1_0.rs
+++ b/tests/expectations/tests/union_bitfield_1_0.rs
@@ -28,12 +28,12 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 c82d3334..f5986246 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 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 737e98d8..29ba59f9 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 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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 e872600d..5bedcadd 100644
--- a/tests/expectations/tests/weird_bitfields.rs
+++ b/tests/expectations/tests/weird_bitfields.rs
@@ -28,12 +28,12 @@ where
         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 @@ where
         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 @@ where
 
         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 @@ where
         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);
         }
     }