coverage. Fix missing LL line number replacement

Author: Lambdaris

src/tools/compiletest/src/runtest.rs

@@ -754,13 +754,14 @@ impl<'test> TestCx<'test> {
 
         // `  |---> 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()
+            Regex::new(r"(?m:^)(?<prefix>(?:  \|)+---> MC/DC Decision Region \()[0-9]+:(?<middle>[0-9]+\) to \()[0-9]+:").unwrap()
         });
-        let coverage = MCDC_DECISION_LINE_NUMBER_RE.replace_all(&coverage, "${prefix}LL:");
+        let coverage =
+            MCDC_DECISION_LINE_NUMBER_RE.replace_all(&coverage, "${prefix}LL:${middle}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()
+            Regex::new(r"(?m:^)(?<prefix>(?:  \|)+     Condition C[0-9]+ --> \()[0-9]+:").unwrap()
         });
         let coverage = MCDC_CONDITION_LINE_NUMBER_RE.replace_all(&coverage, "${prefix}LL:");
 

tests/coverage/mcdc_if.coverage

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