coverage. Fix test typo and reformat

Author: zhuyunxing

compiler/rustc_mir_transform/src/coverage/mappings.rs

@@ -2,19 +2,19 @@ use std::collections::BTreeSet;
 
 use rustc_data_structures::fx::FxIndexMap;
 use rustc_data_structures::graph::DirectedGraph;
-use rustc_index::bit_set::BitSet;
 use rustc_index::IndexVec;
+use rustc_index::bit_set::BitSet;
 use rustc_middle::mir::coverage::{
     BlockMarkerId, BranchSpan, ConditionId, ConditionInfo, CoverageInfoHi, CoverageKind,
 };
 use rustc_middle::mir::{self, BasicBlock, StatementKind};
 use rustc_middle::ty::TyCtxt;
 use rustc_span::Span;
 
+use crate::coverage::ExtractedHirInfo;
 use crate::coverage::graph::{BasicCoverageBlock, CoverageGraph, START_BCB};
 use crate::coverage::spans::extract_refined_covspans;
 use crate::coverage::unexpand::unexpand_into_body_span;
-use crate::coverage::ExtractedHirInfo;
 use crate::errors::MCDCExceedsTestVectorLimit;
 
 /// Associates an ordinary executable code span with its corresponding BCB.
@@ -330,11 +330,7 @@ pub(super) fn extract_mcdc_mappings(
             .reduce(|lhs, rhs| lhs.to(rhs))
             .map(
                 |joint_span| {
-                    if decision_span.contains(joint_span) {
-                        decision_span
-                    } else {
-                        joint_span
-                    }
+                    if decision_span.contains(joint_span) { decision_span } else { joint_span }
                 },
             )
             .expect("branch mappings are ensured to be non-empty as checked above");

tests/coverage/mcdc/condition-limit.cov-map

@@ -1,4 +1,4 @@
-Function name: condition_limit::accpet_7_conditions
+Function name: condition_limit::accept_7_conditions
 Raw bytes (232): 0x[01, 01, 2c, 01, 05, 05, 1d, 05, 1d, 7a, 19, 05, 1d, 7a, 19, 05, 1d, 76, 15, 7a, 19, 05, 1d, 76, 15, 7a, 19, 05, 1d, 72, 11, 76, 15, 7a, 19, 05, 1d, 72, 11, 76, 15, 7a, 19, 05, 1d, 6e, 0d, 72, 11, 76, 15, 7a, 19, 05, 1d, 6e, 0d, 72, 11, 76, 15, 7a, 19, 05, 1d, 9f, 01, 02, a3, 01, 1d, a7, 01, 19, ab, 01, 15, af, 01, 11, 09, 0d, 21, 9b, 01, 9f, 01, 02, a3, 01, 1d, a7, 01, 19, ab, 01, 15, af, 01, 11, 09, 0d, 12, 01, 07, 01, 02, 09, 28, 08, 07, 02, 08, 00, 27, 30, 05, 02, 01, 07, 00, 00, 08, 00, 09, 05, 00, 0d, 00, 0e, 30, 7a, 1d, 07, 06, 00, 00, 0d, 00, 0e, 7a, 00, 12, 00, 13, 30, 76, 19, 06, 05, 00, 00, 12, 00, 13, 76, 00, 17, 00, 18, 30, 72, 15, 05, 04, 00, 00, 17, 00, 18, 72, 00, 1c, 00, 1d, 30, 6e, 11, 04, 03, 00, 00, 1c, 00, 1d, 6e, 00, 21, 00, 22, 30, 6a, 0d, 03, 02, 00, 00, 21, 00, 22, 6a, 00, 26, 00, 27, 30, 21, 09, 02, 00, 00, 00, 26, 00, 27, 21, 00, 28, 02, 06, 9b, 01, 02, 06, 00, 07, 97, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => global file 1

tests/coverage/mcdc/condition-limit.coverage

@@ -4,7 +4,7 @@
    LL|       |//@ compile-flags: -Zcoverage-options=mcdc
    LL|       |//@ llvm-cov-flags: --show-branches=count --show-mcdc
    LL|       |
-   LL|      2|fn accpet_7_conditions(bool_arr: [bool; 7]) {
+   LL|      2|fn accept_7_conditions(bool_arr: [bool; 7]) {
    LL|      2|    let [a, b, c, d, e, f, g] = bool_arr;
    LL|      2|    if a && b && c && d && e && f && g {
                           ^1   ^1   ^1   ^1   ^1   ^1
@@ -50,7 +50,7 @@
    LL|       |
    LL|       |#[coverage(off)]
    LL|       |fn main() {
-   LL|       |    accpet_7_conditions([false; 7]);
-   LL|       |    accpet_7_conditions([true; 7]);
+   LL|       |    accept_7_conditions([false; 7]);
+   LL|       |    accept_7_conditions([true; 7]);
    LL|       |}
 

tests/coverage/mcdc/condition-limit.rs

@@ -4,7 +4,7 @@
 //@ compile-flags: -Zcoverage-options=mcdc
 //@ llvm-cov-flags: --show-branches=count --show-mcdc
 
-fn accpet_7_conditions(bool_arr: [bool; 7]) {
+fn accept_7_conditions(bool_arr: [bool; 7]) {
     let [a, b, c, d, e, f, g] = bool_arr;
     if a && b && c && d && e && f && g {
         core::hint::black_box("hello");
@@ -13,6 +13,6 @@ fn accpet_7_conditions(bool_arr: [bool; 7]) {
 
 #[coverage(off)]
 fn main() {
-    accpet_7_conditions([false; 7]);
-    accpet_7_conditions([true; 7]);
+    accept_7_conditions([false; 7]);
+    accept_7_conditions([true; 7]);
 }

tests/coverage/mcdc/if.coverage

@@ -162,7 +162,7 @@
    LL|       |
    LL|      4|fn mcdc_check_not_tree_decision(a: bool, b: bool, c: bool) {
    LL|      4|    // Contradict to `mcdc_check_tree_decision`,
-   LL|      4|    // 100% branch coverage of this expression does not mean indicates 100% mcdc coverage.
+   LL|      4|    // 100% branch coverage of this expression does not indicate 100% mcdc coverage.
    LL|      4|    if (a || b) && c {
                            ^1
   ------------------

tests/coverage/mcdc/if.rs

@@ -48,7 +48,7 @@ fn mcdc_check_tree_decision(a: bool, b: bool, c: bool) {
 
 fn mcdc_check_not_tree_decision(a: bool, b: bool, c: bool) {
     // Contradict to `mcdc_check_tree_decision`,
-    // 100% branch coverage of this expression does not mean indicates 100% mcdc coverage.
+    // 100% branch coverage of this expression does not indicate 100% mcdc coverage.
     if (a || b) && c {
         say("pass");
     } else {