Unify naming of local variables

src/tests/fixtures/attributes/attrlist.rs

@@ -48,8 +48,8 @@ fn fixture_eq_observed(fixture: &TAttrlist, observed: &Attrlist) -> bool {
         return false;
     }
 
-    for (ta_attr, attr) in fixture.attributes.iter().zip(observed.attributes()) {
-        if ta_attr != attr {
+    for (fixture_attr, observed_attr) in fixture.attributes.iter().zip(observed.attributes()) {
+        if fixture_attr != observed_attr {
             return false;
         }
     }

src/tests/fixtures/attributes/element_attribute.rs

@@ -53,9 +53,9 @@ fn fixture_eq_observed(fixture: &TElementAttribute, observed: &ElementAttribute)
     }
 
     match fixture.name {
-        Some(ref name) => {
-            if let Some(attr_name) = observed.name() {
-                name == attr_name
+        Some(ref fixture_name) => {
+            if let Some(observed_name) = observed.name() {
+                fixture_name == observed_name
             } else {
                 false
             }

src/tests/fixtures/blocks/block.rs

@@ -28,32 +28,28 @@ impl PartialEq<TBlock> for Block<'_> {
 
 fn fixture_eq_observed(fixture: &TBlock, observed: &Block) -> bool {
     match fixture {
-        TBlock::Simple(ref tsimple_block) => match observed {
-            Block::Simple(ref simple_block) => tsimple_block == simple_block,
+        TBlock::Simple(ref simple_fixture) => match observed {
+            Block::Simple(ref simple_observed) => simple_fixture == simple_observed,
             _ => false,
         },
 
-        TBlock::Macro(ref tmacro_block) => match observed {
-            Block::Macro(ref macro_block) => tmacro_block == macro_block,
+        TBlock::Macro(ref macro_fixture) => match observed {
+            Block::Macro(ref macro_observed) => macro_fixture == macro_observed,
             _ => false,
         },
 
-        TBlock::Section(ref tsection_block) => match observed {
-            Block::Section(ref section_block) => tsection_block == section_block,
+        TBlock::Section(ref section_fixture) => match observed {
+            Block::Section(ref section_observed) => section_fixture == section_observed,
             _ => false,
         },
 
-        TBlock::RawDelimited(ref traw_delimited_block) => match observed {
-            Block::RawDelimited(ref raw_delimited_block) => {
-                traw_delimited_block == raw_delimited_block
-            }
+        TBlock::RawDelimited(ref rdb_fixture) => match observed {
+            Block::RawDelimited(ref rdb_observed) => rdb_fixture == rdb_observed,
             _ => false,
         },
 
-        TBlock::CompoundDelimited(ref tcompound_delimited_block) => match observed {
-            Block::CompoundDelimited(ref compound_delimited_block) => {
-                tcompound_delimited_block == compound_delimited_block
-            }
+        TBlock::CompoundDelimited(ref cdb_fixture) => match observed {
+            Block::CompoundDelimited(ref cdb_observed) => cdb_fixture == cdb_observed,
             _ => false,
         },
     }

src/tests/fixtures/blocks/compound_delimited.rs

@@ -47,12 +47,8 @@ fn fixture_eq_observed(
         return false;
     }
 
-    for (td_block, block) in fixture
-        .blocks
-        .iter()
-        .zip(observed.nested_blocks())
-    {
-        if td_block != block {
+    for (fixture_block, observed_block) in fixture.blocks.iter().zip(observed.nested_blocks()) {
+        if fixture_block != observed_block {
             return false;
         }
     }

src/tests/fixtures/blocks/macro.rs

@@ -49,9 +49,9 @@ fn fixture_eq_observed(fixture: &TMacroBlock, observed: &MacroBlock) -> bool {
         return false;
     }
 
-    if let Some(ref th_target) = fixture.target {
-        if let Some(ref h_target) = observed.target() {
-            if &th_target != h_target {
+    if let Some(ref fixture_target) = fixture.target {
+        if let Some(ref observed_target) = observed.target() {
+            if &fixture_target != observed_target {
                 return false;
             }
         }
@@ -65,9 +65,9 @@ fn fixture_eq_observed(fixture: &TMacroBlock, observed: &MacroBlock) -> bool {
         return false;
     }
 
-    if let Some(ref tm_title) = fixture.title {
-        if let Some(ref m_title) = observed.title() {
-            if tm_title != m_title {
+    if let Some(ref fixture_title) = fixture.title {
+        if let Some(ref observed_title) = observed.title() {
+            if fixture_title != observed_title {
                 return false;
             }
         }
@@ -77,9 +77,9 @@ fn fixture_eq_observed(fixture: &TMacroBlock, observed: &MacroBlock) -> bool {
         return false;
     }
 
-    if let Some(ref tm_attrlist) = fixture.attrlist {
-        if let Some(ref m_attrlist) = observed.attrlist() {
-            if &tm_attrlist != m_attrlist {
+    if let Some(ref fixture_attrlist) = fixture.attrlist {
+        if let Some(ref observed_attrlist) = observed.attrlist() {
+            if &fixture_attrlist != observed_attrlist {
                 return false;
             }
         }

src/tests/fixtures/blocks/raw_delimited.rs

@@ -41,16 +41,13 @@ impl PartialEq<TRawDelimitedBlock> for RawDelimitedBlock<'_> {
     }
 }
 
-fn fixture_eq_observed(
-    fixture: &TRawDelimitedBlock,
-    observed: &RawDelimitedBlock,
-) -> bool {
+fn fixture_eq_observed(fixture: &TRawDelimitedBlock, observed: &RawDelimitedBlock) -> bool {
     if fixture.lines.len() != observed.lines().len() {
         return false;
     }
 
-    for (td_line, line) in fixture.lines.iter().zip(observed.lines()) {
-        if td_line != line {
+    for (fixture_line, observed_line) in fixture.lines.iter().zip(observed.lines()) {
+        if fixture_line != observed_line {
             return false;
         }
     }
@@ -67,9 +64,9 @@ fn fixture_eq_observed(
         return false;
     }
 
-    if let Some(ref trdb_title) = fixture.title {
-        if let Some(ref rdb_title) = observed.title() {
-            if trdb_title != rdb_title {
+    if let Some(ref fixture_title) = fixture.title {
+        if let Some(ref observed_title) = observed.title() {
+            if fixture_title != observed_title {
                 return false;
             }
         }
@@ -79,9 +76,9 @@ fn fixture_eq_observed(
         return false;
     }
 
-    if let Some(ref trdb_attrlist) = fixture.attrlist {
-        if let Some(ref rdb_attrlist) = observed.attrlist() {
-            if &trdb_attrlist != rdb_attrlist {
+    if let Some(ref fixture_attrlist) = fixture.attrlist {
+        if let Some(ref observed_attrlist) = observed.attrlist() {
+            if &fixture_attrlist != observed_attrlist {
                 return false;
             }
         }

src/tests/fixtures/blocks/section.rs

@@ -54,8 +54,8 @@ fn fixture_eq_observed(fixture: &TSectionBlock, observed: &SectionBlock) -> bool
         return false;
     }
 
-    for (td_block, block) in fixture.blocks.iter().zip(observed.nested_blocks()) {
-        if td_block != block {
+    for (fixture_block, observed_block) in fixture.blocks.iter().zip(observed.nested_blocks()) {
+        if fixture_block != observed_block {
             return false;
         }
     }
@@ -64,9 +64,9 @@ fn fixture_eq_observed(fixture: &TSectionBlock, observed: &SectionBlock) -> bool
         return false;
     }
 
-    if let Some(ref tsb_title) = fixture.title {
-        if let Some(ref sb_title) = observed.title() {
-            if tsb_title != sb_title {
+    if let Some(ref fixture_title) = fixture.title {
+        if let Some(ref observed_title) = observed.title() {
+            if fixture_title != observed_title {
                 return false;
             }
         }
@@ -76,9 +76,9 @@ fn fixture_eq_observed(fixture: &TSectionBlock, observed: &SectionBlock) -> bool
         return false;
     }
 
-    if let Some(ref tsb_attrlist) = fixture.attrlist {
-        if let Some(ref sb_attrlist) = observed.attrlist() {
-            if &tsb_attrlist != sb_attrlist {
+    if let Some(ref fixture_attrlist) = fixture.attrlist {
+        if let Some(ref observed_attrlist) = observed.attrlist() {
+            if &fixture_attrlist != observed_attrlist {
                 return false;
             }
         }

src/tests/fixtures/blocks/simple.rs

@@ -42,9 +42,9 @@ fn fixture_eq_observed(fixture: &TSimpleBlock, observed: &SimpleBlock) -> bool {
         return false;
     }
 
-    if let Some(ref tsb_title) = fixture.title {
-        if let Some(ref sb_title) = observed.title() {
-            if tsb_title != sb_title {
+    if let Some(ref fixture_title) = fixture.title {
+        if let Some(ref observed_title) = observed.title() {
+            if fixture_title != observed_title {
                 return false;
             }
         }
@@ -54,9 +54,9 @@ fn fixture_eq_observed(fixture: &TSimpleBlock, observed: &SimpleBlock) -> bool {
         return false;
     }
 
-    if let Some(ref tsb_attrlist) = fixture.attrlist {
-        if let Some(ref sb_attrlist) = observed.attrlist() {
-            if &tsb_attrlist != sb_attrlist {
+    if let Some(ref fixture_attrlist) = fixture.attrlist {
+        if let Some(ref observed_attrlist) = observed.attrlist() {
+            if &fixture_attrlist != observed_attrlist {
                 return false;
             }
         }

src/tests/fixtures/document/attribute_value.rs

@@ -29,9 +29,9 @@ impl PartialEq<TAttributeValue> for &AttributeValue<'_> {
 
 fn fixture_eq_observed(fixture: &TAttributeValue, observed: &AttributeValue) -> bool {
     match fixture {
-        TAttributeValue::Value(ref v) => {
-            if let AttributeValue::Value(ref av) = observed {
-                v == &av.as_ref()
+        TAttributeValue::Value(ref fixture_value) => {
+            if let AttributeValue::Value(ref observed_value) = observed {
+                fixture_value == &observed_value.as_ref()
             } else {
                 false
             }

src/tests/fixtures/document/document.rs

@@ -57,8 +57,8 @@ fn fixture_eq_observed(fixture: &TDocument, observed: &Document) -> bool {
         return false;
     }
 
-    for (td_block, block) in fixture.blocks.iter().zip(observed.nested_blocks()) {
-        if td_block != block {
+    for (fixture_block, observed_block) in fixture.blocks.iter().zip(observed.nested_blocks()) {
+        if fixture_block != observed_block {
             return false;
         }
     }
@@ -67,8 +67,8 @@ fn fixture_eq_observed(fixture: &TDocument, observed: &Document) -> bool {
         return false;
     }
 
-    for (td_warning, warning) in fixture.warnings.iter().zip(observed.warnings()) {
-        if td_warning != warning {
+    for (fixture_warning, observed_warning) in fixture.warnings.iter().zip(observed.warnings()) {
+        if fixture_warning != observed_warning {
             return false;
         }
     }

src/tests/fixtures/document/header.rs

@@ -50,9 +50,9 @@ fn fixture_eq_observed(fixture: &THeader, observed: &Header) -> bool {
         return false;
     }
 
-    if let Some(ref th_title) = fixture.title {
-        if let Some(ref h_title) = observed.title() {
-            if th_title != h_title {
+    if let Some(ref fixture_title) = fixture.title {
+        if let Some(ref observed_title) = observed.title() {
+            if fixture_title != observed_title {
                 return false;
             }
         }
@@ -62,8 +62,10 @@ fn fixture_eq_observed(fixture: &THeader, observed: &Header) -> bool {
         return false;
     }
 
-    for (th_attribute, attribute) in fixture.attributes.iter().zip(observed.attributes()) {
-        if th_attribute != attribute {
+    for (fixture_attribute, observed_attribute) in
+        fixture.attributes.iter().zip(observed.attributes())
+    {
+        if fixture_attribute != observed_attribute {
             return false;
         }
     }

src/tests/fixtures/document/raw_attribute_value.rs

@@ -29,9 +29,9 @@ impl PartialEq<TRawAttributeValue> for &RawAttributeValue<'_> {
 
 fn fixture_eq_observed(fixture: &TRawAttributeValue, observed: &RawAttributeValue) -> bool {
     match fixture {
-        TRawAttributeValue::Value(ref v) => {
-            if let RawAttributeValue::Value(ref av) = observed {
-                v == av
+        TRawAttributeValue::Value(ref fixture_value) => {
+            if let RawAttributeValue::Value(ref observed_value) = observed {
+                fixture_value == observed_value
             } else {
                 false
             }

src/tests/fixtures/inlines/inline.rs

@@ -24,30 +24,30 @@ impl PartialEq<TInline> for Inline<'_> {
 
 fn fixture_eq_observed(fixture: &TInline, observed: &Inline) -> bool {
     match fixture {
-        TInline::Uninterpreted(ref tspan) => match observed {
-            Inline::Uninterpreted(ref span) => tspan == span,
+        TInline::Uninterpreted(ref fixture_span) => match observed {
+            Inline::Uninterpreted(ref observed_span) => fixture_span == observed_span,
             _ => false,
         },
 
-        TInline::Sequence(ref tinlines, ref tspan) => match observed {
-            Inline::Sequence(ref inlines, ref span) => {
-                if tinlines.len() != inlines.len() {
+        TInline::Sequence(ref fixture_inlines, ref fixture_span) => match observed {
+            Inline::Sequence(ref observed_inlines, ref observed_span) => {
+                if fixture_inlines.len() != observed_inlines.len() {
                     return false;
                 }
 
-                for (fixture, observed) in tinlines.iter().zip(inlines.iter()) {
+                for (fixture, observed) in fixture_inlines.iter().zip(observed_inlines.iter()) {
                     if fixture != observed {
                         return false;
                     }
                 }
 
-                tspan == span
+                fixture_span == observed_span
             }
             _ => false,
         },
 
-        TInline::Macro(ref tinline_macro) => match observed {
-            Inline::Macro(ref inline_macro) => tinline_macro == inline_macro,
+        TInline::Macro(ref fixture_macro) => match observed {
+            Inline::Macro(ref observed_macro) => fixture_macro == observed_macro,
             _ => false,
         },
     }

src/tests/fixtures/inlines/macro.rs

@@ -42,9 +42,9 @@ fn fixture_eq_observed(fixture: &TInlineMacro, observed: &InlineMacro) -> bool {
         return false;
     }
 
-    if let Some(ref th_target) = fixture.target {
-        if let Some(ref h_target) = observed.target() {
-            if &th_target != h_target {
+    if let Some(ref fixture_target) = fixture.target {
+        if let Some(ref observed_target) = observed.target() {
+            if &fixture_target != observed_target {
                 return false;
             }
         }
@@ -54,9 +54,9 @@ fn fixture_eq_observed(fixture: &TInlineMacro, observed: &InlineMacro) -> bool {
         return false;
     }
 
-    if let Some(ref th_attrlist) = fixture.attrlist {
-        if let Some(ref h_attrlist) = observed.attrlist() {
-            if &th_attrlist != h_attrlist {
+    if let Some(ref fixture_attrlist) = fixture.attrlist {
+        if let Some(ref observed_attrlist) = observed.attrlist() {
+            if &fixture_attrlist != observed_attrlist {
                 return false;
             }
         }