coverage. Adopt a nicer dereference style for BcbMappingKind

Author: Lambdaris

compiler/rustc_mir_transform/src/coverage/mod.rs

@@ -142,27 +142,24 @@ fn create_mappings<'tcx>(
 
     mappings.extend(coverage_spans.all_bcb_mappings().filter_map(
         |BcbMapping { kind: bcb_mapping_kind, span }| {
-            let kind = match bcb_mapping_kind {
-                BcbMappingKind::Code(bcb) => MappingKind::Code(term_for_bcb(*bcb)),
+            let kind = match *bcb_mapping_kind {
+                BcbMappingKind::Code(bcb) => MappingKind::Code(term_for_bcb(bcb)),
                 BcbMappingKind::Branch { true_bcb, false_bcb, condition_info } => {
                     if condition_info.condition_id == ConditionId::NONE {
                         MappingKind::Branch {
-                            true_term: term_for_bcb(*true_bcb),
-                            false_term: term_for_bcb(*false_bcb),
+                            true_term: term_for_bcb(true_bcb),
+                            false_term: term_for_bcb(false_bcb),
                         }
                     } else {
                         MappingKind::MCDCBranch {
-                            true_term: term_for_bcb(*true_bcb),
-                            false_term: term_for_bcb(*false_bcb),
-                            mcdc_params: *condition_info,
+                            true_term: term_for_bcb(true_bcb),
+                            false_term: term_for_bcb(false_bcb),
+                            mcdc_params: condition_info,
                         }
                     }
                 }
                 BcbMappingKind::Decision { bitmap_idx, conditions_num, .. } => {
-                    MappingKind::MCDCDecision(DecisionInfo {
-                        bitmap_idx: *bitmap_idx,
-                        conditions_num: *conditions_num,
-                    })
+                    MappingKind::MCDCDecision(DecisionInfo { bitmap_idx, conditions_num })
                 }
             };
             let code_region = make_code_region(source_map, file_name, *span, body_span)?;

compiler/rustc_mir_transform/src/coverage/spans.rs

@@ -101,18 +101,18 @@ pub(super) fn generate_coverage_spans(
     };
     let mut test_vector_bitmap_bytes = 0;
     for BcbMapping { kind, span: _ } in &mappings {
-        match kind {
-            BcbMappingKind::Code(bcb) => insert(*bcb),
+        match *kind {
+            BcbMappingKind::Code(bcb) => insert(bcb),
             BcbMappingKind::Branch { true_bcb, false_bcb, .. } => {
-                insert(*true_bcb);
-                insert(*false_bcb);
+                insert(true_bcb);
+                insert(false_bcb);
             }
             BcbMappingKind::Decision { bitmap_idx, conditions_num, .. } => {
                 // `bcb_has_mappings` is used for inject coverage counters
                 // but they are not needed for decision BCBs.
                 // While the length of test vector bitmap should be calculated here.
                 test_vector_bitmap_bytes = test_vector_bitmap_bytes
-                    .max(bitmap_idx + (1_u32 << *conditions_num as u32).div_ceil(8));
+                    .max(bitmap_idx + (1_u32 << conditions_num as u32).div_ceil(8));
             }
         }
     }