coverage. Replace line numbers in mcdc reports with LL

Author: Lambdaris

src/tools/compiletest/src/runtest.rs

@@ -277,11 +277,19 @@ impl<'test> TestCx<'test> {
             Ui | MirOpt => false,
             mode => panic!("unimplemented for mode {:?}", mode),
         };
-        if test_should_run { self.run_if_enabled() } else { WillExecute::No }
+        if test_should_run {
+            self.run_if_enabled()
+        } else {
+            WillExecute::No
+        }
     }
 
     fn run_if_enabled(&self) -> WillExecute {
-        if self.config.run_enabled() { WillExecute::Yes } else { WillExecute::Disabled }
+        if self.config.run_enabled() {
+            WillExecute::Yes
+        } else {
+            WillExecute::Disabled
+        }
     }
 
     fn should_run_successfully(&self, pm: Option<PassMode>) -> bool {
@@ -752,6 +760,18 @@ impl<'test> TestCx<'test> {
             Lazy::new(|| Regex::new(r"(?m:^)(?<prefix>(?:  \|)+  Branch \()[0-9]+:").unwrap());
         let coverage = BRANCH_LINE_NUMBER_RE.replace_all(&coverage, "${prefix}LL:");
 
+        // `  |---> MC/DC Decision Region (1:`     => `  |---> MC/DC Decision Region (LL:`
+        static MCDC_DECISION_LINE_NUMBER_RE: Lazy<Regex> = Lazy::new(|| {
+            Regex::new(r"(?m:^)(?<prefix>(?:  \|)+---> MC/DC Decision Region \()[0-9]+:").unwrap()
+        });
+        let coverage = MCDC_DECISION_LINE_NUMBER_RE.replace_all(&coverage, "${prefix}LL:");
+
+        // `  |     Condition C1 --> (1:`     => `  |     Condition C1 --> (LL:`
+        static MCDC_CONDITION_LINE_NUMBER_RE: Lazy<Regex> = Lazy::new(|| {
+            Regex::new(r"(?m:^)(?<prefix>(?:  \|)+     Condition C\d+ --> \()[0-9]+:").unwrap()
+        });
+        let coverage = MCDC_CONDITION_LINE_NUMBER_RE.replace_all(&coverage, "${prefix}LL:");
+
         coverage.into_owned()
     }
 
@@ -2722,7 +2742,11 @@ impl<'test> TestCx<'test> {
     /// The revision, ignored for incremental compilation since it wants all revisions in
     /// the same directory.
     fn safe_revision(&self) -> Option<&str> {
-        if self.config.mode == Incremental { None } else { self.revision }
+        if self.config.mode == Incremental {
+            None
+        } else {
+            self.revision
+        }
     }
 
     /// Gets the absolute path to the directory where all output for the given
@@ -2945,7 +2969,11 @@ impl<'test> TestCx<'test> {
 
     fn charset() -> &'static str {
         // FreeBSD 10.1 defaults to GDB 6.1.1 which doesn't support "auto" charset
-        if cfg!(target_os = "freebsd") { "ISO-8859-1" } else { "UTF-8" }
+        if cfg!(target_os = "freebsd") {
+            "ISO-8859-1"
+        } else {
+            "UTF-8"
+        }
     }
 
     fn run_rustdoc_test(&self) {
@@ -4747,7 +4775,11 @@ impl<'test> TestCx<'test> {
         for output_file in files {
             println!("Actual {} saved to {}", kind, output_file.display());
         }
-        if self.config.bless { 0 } else { 1 }
+        if self.config.bless {
+            0
+        } else {
+            1
+        }
     }
 
     fn check_and_prune_duplicate_outputs(

tests/coverage/mcdc_if.coverage

@@ -7,11 +7,11 @@
    LL|      2|    if a && b {
                           ^0
   ------------------
-  |---> MC/DC Decision Region (7:8) to (7:14)
+  |---> MC/DC Decision Region (LL:8) to (7:14)
   |
   |  Number of Conditions: 2
-  |     Condition C1 --> (7:8)
-  |     Condition C2 --> (7:13)
+  |     Condition C1 --> (LL:8)
+  |     Condition C2 --> (LL:13)
   |
   |  Executed MC/DC Test Vectors:
   |
@@ -33,11 +33,11 @@
    LL|      2|    if a && b {
                           ^1
   ------------------
-  |---> MC/DC Decision Region (15:8) to (15:14)
+  |---> MC/DC Decision Region (LL:8) to (15:14)
   |
   |  Number of Conditions: 2
-  |     Condition C1 --> (15:8)
-  |     Condition C2 --> (15:13)
+  |     Condition C1 --> (LL:8)
+  |     Condition C2 --> (LL:13)
   |
   |  Executed MC/DC Test Vectors:
   |
@@ -59,11 +59,11 @@
    LL|      2|fn mcdc_check_b(a: bool, b: bool) {
    LL|      2|    if a && b {
   ------------------
-  |---> MC/DC Decision Region (23:8) to (23:14)
+  |---> MC/DC Decision Region (LL:8) to (23:14)
   |
   |  Number of Conditions: 2
-  |     Condition C1 --> (23:8)
-  |     Condition C2 --> (23:13)
+  |     Condition C1 --> (LL:8)
+  |     Condition C2 --> (LL:13)
   |
   |  Executed MC/DC Test Vectors:
   |
@@ -86,11 +86,11 @@
    LL|      3|    if a && b {
                           ^2
   ------------------
-  |---> MC/DC Decision Region (31:8) to (31:14)
+  |---> MC/DC Decision Region (LL:8) to (31:14)
   |
   |  Number of Conditions: 2
-  |     Condition C1 --> (31:8)
-  |     Condition C2 --> (31:13)
+  |     Condition C1 --> (LL:8)
+  |     Condition C2 --> (LL:13)
   |
   |  Executed MC/DC Test Vectors:
   |
@@ -116,12 +116,12 @@
    LL|      4|    if a && (b || c) {
                            ^3   ^2
   ------------------
-  |---> MC/DC Decision Region (41:8) to (41:21)
+  |---> MC/DC Decision Region (LL:8) to (41:21)
   |
   |  Number of Conditions: 3
-  |     Condition C1 --> (41:8)
-  |     Condition C2 --> (41:14)
-  |     Condition C3 --> (41:19)
+  |     Condition C1 --> (LL:8)
+  |     Condition C2 --> (LL:14)
+  |     Condition C3 --> (LL:19)
   |
   |  Executed MC/DC Test Vectors:
   |
@@ -149,12 +149,12 @@
    LL|      4|    if (a || b) && c {
                            ^1
   ------------------
-  |---> MC/DC Decision Region (51:8) to (51:21)
+  |---> MC/DC Decision Region (LL:8) to (51:21)
   |
   |  Number of Conditions: 3
-  |     Condition C1 --> (51:9)
-  |     Condition C2 --> (51:14)
-  |     Condition C3 --> (51:20)
+  |     Condition C1 --> (LL:9)
+  |     Condition C2 --> (LL:14)
+  |     Condition C3 --> (LL:20)
   |
   |  Executed MC/DC Test Vectors:
   |
@@ -179,11 +179,11 @@
    LL|      3|    if a || b {
                           ^0
   ------------------
-  |---> MC/DC Decision Region (59:8) to (59:14)
+  |---> MC/DC Decision Region (LL:8) to (59:14)
   |
   |  Number of Conditions: 2
-  |     Condition C1 --> (59:8)
-  |     Condition C2 --> (59:13)
+  |     Condition C1 --> (LL:8)
+  |     Condition C2 --> (LL:13)
   |
   |  Executed MC/DC Test Vectors:
   |
@@ -199,11 +199,11 @@
    LL|      3|        if b && c {
                               ^2
   ------------------
-  |---> MC/DC Decision Region (61:12) to (61:18)
+  |---> MC/DC Decision Region (LL:12) to (61:18)
   |
   |  Number of Conditions: 2
-  |     Condition C1 --> (61:12)
-  |     Condition C2 --> (61:17)
+  |     Condition C1 --> (LL:12)
+  |     Condition C2 --> (LL:17)
   |
   |  Executed MC/DC Test Vectors:
   |