diff --git a/src/json.rs b/src/json.rs index 42fa1a22..20e1f677 100644 --- a/src/json.rs +++ b/src/json.rs @@ -148,6 +148,7 @@ type UncoveredLines = BTreeMap>; #[non_exhaustive] #[derive(Clone, Copy)] +#[cfg_attr(test, derive(Debug))] pub enum CoverageKind { Functions, Lines, @@ -565,8 +566,8 @@ mod tests { fn test_get_coverage_percent(kind: CoverageKind) { let expected = match kind { CoverageKind::Functions => 100_f64, - CoverageKind::Lines => 68.181_818_181_818_19, - CoverageKind::Regions => 66.666_666_666_666_67, + CoverageKind::Lines => 63.157_894_736_842_1, + CoverageKind::Regions => 60., }; // There are 5 different percentages, make sure we pick the correct one. @@ -580,7 +581,7 @@ mod tests { let actual = json.get_coverage_percent(kind).unwrap(); let error_margin = f64::EPSILON; - assert!((actual - expected).abs() < error_margin, "{actual}"); + assert!((actual - expected).abs() < error_margin, "kind={kind:?},actual={actual}"); } #[test] diff --git a/tests/fixtures/coverage-reports/cargo_config/cargo_config.codecov.json b/tests/fixtures/coverage-reports/cargo_config/cargo_config.codecov.json index d52e7981..302b58c8 100644 --- a/tests/fixtures/coverage-reports/cargo_config/cargo_config.codecov.json +++ b/tests/fixtures/coverage-reports/cargo_config/cargo_config.codecov.json @@ -1 +1 @@ -{"coverage":{"src/lib.rs":{"1":"1/1","2":"1/1","3":"0/1","5":"1/1","7":"1/1","9":"1/1","10":"1/1","11":"1/1","12":"1/1","15":"1/1"}}} \ No newline at end of file +{"coverage":{"src/lib.rs":{"1":"1/1","2":"1/1","3":"0/1","5":"1/1","7":"1/1","10":"1/1","11":"1/1","12":"1/1","15":"1/1"}}} \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/cargo_config/cargo_config.hide-instantiations.txt b/tests/fixtures/coverage-reports/cargo_config/cargo_config.hide-instantiations.txt index a60c38de..10dd9348 100644 --- a/tests/fixtures/coverage-reports/cargo_config/cargo_config.hide-instantiations.txt +++ b/tests/fixtures/coverage-reports/cargo_config/cargo_config.hide-instantiations.txt @@ -6,7 +6,7 @@ 6| | } 7| 1|} 8| | - 9| 1|#[test] + 9| |#[test] 10| 1|fn test() { 11| 1| #[cfg(a)] 12| 1| assert!(!func(1)); diff --git a/tests/fixtures/coverage-reports/cargo_config/cargo_config.json b/tests/fixtures/coverage-reports/cargo_config/cargo_config.json index b5dcd0e4..d5fb97b7 100644 --- a/tests/fixtures/coverage-reports/cargo_config/cargo_config.json +++ b/tests/fixtures/coverage-reports/cargo_config/cargo_config.json @@ -12,25 +12,25 @@ "percent": 0.0 }, "functions": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100.0 }, "instantiations": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100.0 }, "lines": { - "count": 10, - "covered": 9, - "percent": 90.0 + "count": 9, + "covered": 8, + "percent": 88.88888888888889 }, "regions": { - "count": 7, - "covered": 6, + "count": 6, + "covered": 5, "notcovered": 1, - "percent": 85.71428571428571 + "percent": 83.33333333333334 } } } @@ -43,25 +43,25 @@ "percent": 0 }, "functions": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100 }, "instantiations": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100 }, "lines": { - "count": 10, - "covered": 9, - "percent": 90 + "count": 9, + "covered": 8, + "percent": 88.88888888888889 }, "regions": { - "count": 7, - "covered": 6, + "count": 6, + "covered": 5, "notcovered": 1, - "percent": 85.71428571428571 + "percent": 83.33333333333334 } } } diff --git a/tests/fixtures/coverage-reports/cargo_config/cargo_config.lcov.info b/tests/fixtures/coverage-reports/cargo_config/cargo_config.lcov.info index 71936f3f..327f72ba 100644 --- a/tests/fixtures/coverage-reports/cargo_config/cargo_config.lcov.info +++ b/tests/fixtures/coverage-reports/cargo_config/cargo_config.lcov.info @@ -1,8 +1,8 @@ SF:src/lib.rs -FNF:3 -FNH:3 +FNF:2 +FNH:2 BRF:0 BRH:0 -LF:10 -LH:9 +LF:9 +LH:8 end_of_record \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/cargo_config/cargo_config.summary.txt b/tests/fixtures/coverage-reports/cargo_config/cargo_config.summary.txt index 65cdcfdf..1c3342d9 100644 --- a/tests/fixtures/coverage-reports/cargo_config/cargo_config.summary.txt +++ b/tests/fixtures/coverage-reports/cargo_config/cargo_config.summary.txt @@ -1,5 +1,5 @@ Filename Regions Missed Regions Cover Functions Missed Functions Executed Lines Missed Lines Cover Branches Missed Branches Cover ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -src/lib.rs 7 1 85.71% 3 0 100.00% 10 1 90.00% 0 0 - +src/lib.rs 6 1 83.33% 2 0 100.00% 9 1 88.89% 0 0 - ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -TOTAL 7 1 85.71% 3 0 100.00% 10 1 90.00% 0 0 - \ No newline at end of file +TOTAL 6 1 83.33% 2 0 100.00% 9 1 88.89% 0 0 - \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/cargo_config/cargo_config.txt b/tests/fixtures/coverage-reports/cargo_config/cargo_config.txt index a60c38de..10dd9348 100644 --- a/tests/fixtures/coverage-reports/cargo_config/cargo_config.txt +++ b/tests/fixtures/coverage-reports/cargo_config/cargo_config.txt @@ -6,7 +6,7 @@ 6| | } 7| 1|} 8| | - 9| 1|#[test] + 9| |#[test] 10| 1|fn test() { 11| 1| #[cfg(a)] 12| 1| assert!(!func(1)); diff --git a/tests/fixtures/coverage-reports/cargo_config_toml/cargo_config_toml.codecov.json b/tests/fixtures/coverage-reports/cargo_config_toml/cargo_config_toml.codecov.json index d52e7981..302b58c8 100644 --- a/tests/fixtures/coverage-reports/cargo_config_toml/cargo_config_toml.codecov.json +++ b/tests/fixtures/coverage-reports/cargo_config_toml/cargo_config_toml.codecov.json @@ -1 +1 @@ -{"coverage":{"src/lib.rs":{"1":"1/1","2":"1/1","3":"0/1","5":"1/1","7":"1/1","9":"1/1","10":"1/1","11":"1/1","12":"1/1","15":"1/1"}}} \ No newline at end of file +{"coverage":{"src/lib.rs":{"1":"1/1","2":"1/1","3":"0/1","5":"1/1","7":"1/1","10":"1/1","11":"1/1","12":"1/1","15":"1/1"}}} \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/cargo_config_toml/cargo_config_toml.hide-instantiations.txt b/tests/fixtures/coverage-reports/cargo_config_toml/cargo_config_toml.hide-instantiations.txt index a60c38de..10dd9348 100644 --- a/tests/fixtures/coverage-reports/cargo_config_toml/cargo_config_toml.hide-instantiations.txt +++ b/tests/fixtures/coverage-reports/cargo_config_toml/cargo_config_toml.hide-instantiations.txt @@ -6,7 +6,7 @@ 6| | } 7| 1|} 8| | - 9| 1|#[test] + 9| |#[test] 10| 1|fn test() { 11| 1| #[cfg(a)] 12| 1| assert!(!func(1)); diff --git a/tests/fixtures/coverage-reports/cargo_config_toml/cargo_config_toml.json b/tests/fixtures/coverage-reports/cargo_config_toml/cargo_config_toml.json index b5dcd0e4..d5fb97b7 100644 --- a/tests/fixtures/coverage-reports/cargo_config_toml/cargo_config_toml.json +++ b/tests/fixtures/coverage-reports/cargo_config_toml/cargo_config_toml.json @@ -12,25 +12,25 @@ "percent": 0.0 }, "functions": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100.0 }, "instantiations": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100.0 }, "lines": { - "count": 10, - "covered": 9, - "percent": 90.0 + "count": 9, + "covered": 8, + "percent": 88.88888888888889 }, "regions": { - "count": 7, - "covered": 6, + "count": 6, + "covered": 5, "notcovered": 1, - "percent": 85.71428571428571 + "percent": 83.33333333333334 } } } @@ -43,25 +43,25 @@ "percent": 0 }, "functions": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100 }, "instantiations": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100 }, "lines": { - "count": 10, - "covered": 9, - "percent": 90 + "count": 9, + "covered": 8, + "percent": 88.88888888888889 }, "regions": { - "count": 7, - "covered": 6, + "count": 6, + "covered": 5, "notcovered": 1, - "percent": 85.71428571428571 + "percent": 83.33333333333334 } } } diff --git a/tests/fixtures/coverage-reports/cargo_config_toml/cargo_config_toml.lcov.info b/tests/fixtures/coverage-reports/cargo_config_toml/cargo_config_toml.lcov.info index 71936f3f..327f72ba 100644 --- a/tests/fixtures/coverage-reports/cargo_config_toml/cargo_config_toml.lcov.info +++ b/tests/fixtures/coverage-reports/cargo_config_toml/cargo_config_toml.lcov.info @@ -1,8 +1,8 @@ SF:src/lib.rs -FNF:3 -FNH:3 +FNF:2 +FNH:2 BRF:0 BRH:0 -LF:10 -LH:9 +LF:9 +LH:8 end_of_record \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/cargo_config_toml/cargo_config_toml.summary.txt b/tests/fixtures/coverage-reports/cargo_config_toml/cargo_config_toml.summary.txt index 65cdcfdf..1c3342d9 100644 --- a/tests/fixtures/coverage-reports/cargo_config_toml/cargo_config_toml.summary.txt +++ b/tests/fixtures/coverage-reports/cargo_config_toml/cargo_config_toml.summary.txt @@ -1,5 +1,5 @@ Filename Regions Missed Regions Cover Functions Missed Functions Executed Lines Missed Lines Cover Branches Missed Branches Cover ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -src/lib.rs 7 1 85.71% 3 0 100.00% 10 1 90.00% 0 0 - +src/lib.rs 6 1 83.33% 2 0 100.00% 9 1 88.89% 0 0 - ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -TOTAL 7 1 85.71% 3 0 100.00% 10 1 90.00% 0 0 - \ No newline at end of file +TOTAL 6 1 83.33% 2 0 100.00% 9 1 88.89% 0 0 - \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/cargo_config_toml/cargo_config_toml.txt b/tests/fixtures/coverage-reports/cargo_config_toml/cargo_config_toml.txt index a60c38de..10dd9348 100644 --- a/tests/fixtures/coverage-reports/cargo_config_toml/cargo_config_toml.txt +++ b/tests/fixtures/coverage-reports/cargo_config_toml/cargo_config_toml.txt @@ -6,7 +6,7 @@ 6| | } 7| 1|} 8| | - 9| 1|#[test] + 9| |#[test] 10| 1|fn test() { 11| 1| #[cfg(a)] 12| 1| assert!(!func(1)); diff --git a/tests/fixtures/coverage-reports/coverage_helper/coverage_helper.codecov.json b/tests/fixtures/coverage-reports/coverage_helper/coverage_helper.codecov.json index fac2eb1d..0d389740 100644 --- a/tests/fixtures/coverage-reports/coverage_helper/coverage_helper.codecov.json +++ b/tests/fixtures/coverage-reports/coverage_helper/coverage_helper.codecov.json @@ -1 +1 @@ -{"coverage":{"src/lib.rs":{"5":"1/1","6":"1/1","7":"1/1","8":"0/1","9":"1/1","10":"0/1","11":"0/1","13":"1/1","15":"1/1"}}} \ No newline at end of file +{"coverage":{"src/lib.rs":{"5":"1/1","6":"1/1","7":"1/1","8":"0/1","9":"1/1","10":"0/1","11":"0/1","13":"1/1"}}} \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/coverage_helper/coverage_helper.hide-instantiations.txt b/tests/fixtures/coverage-reports/coverage_helper/coverage_helper.hide-instantiations.txt index bd5bbf39..52b8f3cf 100644 --- a/tests/fixtures/coverage-reports/coverage_helper/coverage_helper.hide-instantiations.txt +++ b/tests/fixtures/coverage-reports/coverage_helper/coverage_helper.hide-instantiations.txt @@ -12,7 +12,7 @@ 12| | } 13| 2|} 14| | - 15| 1|#[test] + 15| |#[test] 16| |fn test() { 17| | func(0); 18| | diff --git a/tests/fixtures/coverage-reports/coverage_helper/coverage_helper.json b/tests/fixtures/coverage-reports/coverage_helper/coverage_helper.json index 38a0a7d8..79022cc9 100644 --- a/tests/fixtures/coverage-reports/coverage_helper/coverage_helper.json +++ b/tests/fixtures/coverage-reports/coverage_helper/coverage_helper.json @@ -12,25 +12,25 @@ "percent": 0.0 }, "functions": { - "count": 2, - "covered": 2, + "count": 1, + "covered": 1, "percent": 100.0 }, "instantiations": { - "count": 2, - "covered": 2, + "count": 1, + "covered": 1, "percent": 100.0 }, "lines": { - "count": 9, - "covered": 6, - "percent": 66.66666666666666 - }, - "regions": { "count": 8, "covered": 5, - "notcovered": 3, "percent": 62.5 + }, + "regions": { + "count": 7, + "covered": 4, + "notcovered": 3, + "percent": 57.14285714285714 } } } @@ -43,25 +43,25 @@ "percent": 0 }, "functions": { - "count": 2, - "covered": 2, + "count": 1, + "covered": 1, "percent": 100 }, "instantiations": { - "count": 2, - "covered": 2, + "count": 1, + "covered": 1, "percent": 100 }, "lines": { - "count": 9, - "covered": 6, - "percent": 66.66666666666666 - }, - "regions": { "count": 8, "covered": 5, - "notcovered": 3, "percent": 62.5 + }, + "regions": { + "count": 7, + "covered": 4, + "notcovered": 3, + "percent": 57.14285714285714 } } } diff --git a/tests/fixtures/coverage-reports/coverage_helper/coverage_helper.lcov.info b/tests/fixtures/coverage-reports/coverage_helper/coverage_helper.lcov.info index 29029664..ed626dc1 100644 --- a/tests/fixtures/coverage-reports/coverage_helper/coverage_helper.lcov.info +++ b/tests/fixtures/coverage-reports/coverage_helper/coverage_helper.lcov.info @@ -1,8 +1,8 @@ SF:src/lib.rs -FNF:2 -FNH:2 +FNF:1 +FNH:1 BRF:0 BRH:0 -LF:9 -LH:6 +LF:8 +LH:5 end_of_record \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/coverage_helper/coverage_helper.summary.txt b/tests/fixtures/coverage-reports/coverage_helper/coverage_helper.summary.txt index eac38351..5920aafe 100644 --- a/tests/fixtures/coverage-reports/coverage_helper/coverage_helper.summary.txt +++ b/tests/fixtures/coverage-reports/coverage_helper/coverage_helper.summary.txt @@ -1,5 +1,5 @@ Filename Regions Missed Regions Cover Functions Missed Functions Executed Lines Missed Lines Cover Branches Missed Branches Cover ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -src/lib.rs 8 3 62.50% 2 0 100.00% 9 3 66.67% 0 0 - +src/lib.rs 7 3 57.14% 1 0 100.00% 8 3 62.50% 0 0 - ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -TOTAL 8 3 62.50% 2 0 100.00% 9 3 66.67% 0 0 - \ No newline at end of file +TOTAL 7 3 57.14% 1 0 100.00% 8 3 62.50% 0 0 - \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/coverage_helper/coverage_helper.txt b/tests/fixtures/coverage-reports/coverage_helper/coverage_helper.txt index bd5bbf39..52b8f3cf 100644 --- a/tests/fixtures/coverage-reports/coverage_helper/coverage_helper.txt +++ b/tests/fixtures/coverage-reports/coverage_helper/coverage_helper.txt @@ -12,7 +12,7 @@ 12| | } 13| 2|} 14| | - 15| 1|#[test] + 15| |#[test] 16| |fn test() { 17| | func(0); 18| | diff --git a/tests/fixtures/coverage-reports/instantiations/instantiations.codecov.json b/tests/fixtures/coverage-reports/instantiations/instantiations.codecov.json index ee2c6a69..5140371f 100644 --- a/tests/fixtures/coverage-reports/instantiations/instantiations.codecov.json +++ b/tests/fixtures/coverage-reports/instantiations/instantiations.codecov.json @@ -1 +1 @@ -{"coverage":{"src/lib.rs":{"3":"1/1","4":"1/1","5":"1/1","7":"1/1","9":"1/1","11":"1/1","12":"1/1","13":"1/1","14":"1/1","15":"1/1"}}} \ No newline at end of file +{"coverage":{"src/lib.rs":{"3":"1/1","4":"1/1","5":"1/1","7":"1/1","9":"1/1","12":"1/1","13":"1/1","14":"1/1","15":"1/1"}}} \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/instantiations/instantiations.hide-instantiations.txt b/tests/fixtures/coverage-reports/instantiations/instantiations.hide-instantiations.txt index dd3e3a98..90904727 100644 --- a/tests/fixtures/coverage-reports/instantiations/instantiations.hide-instantiations.txt +++ b/tests/fixtures/coverage-reports/instantiations/instantiations.hide-instantiations.txt @@ -8,7 +8,7 @@ 8| | } 9| 2|} 10| | - 11| 1|#[test] + 11| |#[test] 12| 1|fn test() { 13| 1| assert!(!func(1_f32)); 14| 1| assert!(func(-1_i32)); diff --git a/tests/fixtures/coverage-reports/instantiations/instantiations.json b/tests/fixtures/coverage-reports/instantiations/instantiations.json index f8b601b8..1888bee3 100644 --- a/tests/fixtures/coverage-reports/instantiations/instantiations.json +++ b/tests/fixtures/coverage-reports/instantiations/instantiations.json @@ -12,25 +12,25 @@ "percent": 0.0 }, "functions": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100.0 }, "instantiations": { - "count": 4, - "covered": 4, + "count": 3, + "covered": 3, "percent": 100.0 }, "lines": { - "count": 10, - "covered": 9, - "percent": 90.0 + "count": 9, + "covered": 8, + "percent": 88.88888888888889 }, "regions": { - "count": 8, - "covered": 7, + "count": 7, + "covered": 6, "notcovered": 1, - "percent": 87.5 + "percent": 85.71428571428571 } } } @@ -43,25 +43,25 @@ "percent": 0 }, "functions": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100 }, "instantiations": { - "count": 4, - "covered": 4, + "count": 3, + "covered": 3, "percent": 100 }, "lines": { - "count": 10, - "covered": 9, - "percent": 90 + "count": 9, + "covered": 8, + "percent": 88.88888888888889 }, "regions": { - "count": 8, - "covered": 7, + "count": 7, + "covered": 6, "notcovered": 1, - "percent": 87.5 + "percent": 85.71428571428571 } } } diff --git a/tests/fixtures/coverage-reports/instantiations/instantiations.lcov.info b/tests/fixtures/coverage-reports/instantiations/instantiations.lcov.info index 71936f3f..327f72ba 100644 --- a/tests/fixtures/coverage-reports/instantiations/instantiations.lcov.info +++ b/tests/fixtures/coverage-reports/instantiations/instantiations.lcov.info @@ -1,8 +1,8 @@ SF:src/lib.rs -FNF:3 -FNH:3 +FNF:2 +FNH:2 BRF:0 BRH:0 -LF:10 -LH:9 +LF:9 +LH:8 end_of_record \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/instantiations/instantiations.summary.txt b/tests/fixtures/coverage-reports/instantiations/instantiations.summary.txt index b4391029..5db6622c 100644 --- a/tests/fixtures/coverage-reports/instantiations/instantiations.summary.txt +++ b/tests/fixtures/coverage-reports/instantiations/instantiations.summary.txt @@ -1,5 +1,5 @@ Filename Regions Missed Regions Cover Functions Missed Functions Executed Lines Missed Lines Cover Branches Missed Branches Cover ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -src/lib.rs 8 1 87.50% 3 0 100.00% 10 1 90.00% 0 0 - +src/lib.rs 7 1 85.71% 2 0 100.00% 9 1 88.89% 0 0 - ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -TOTAL 8 1 87.50% 3 0 100.00% 10 1 90.00% 0 0 - \ No newline at end of file +TOTAL 7 1 85.71% 2 0 100.00% 9 1 88.89% 0 0 - \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/instantiations/instantiations.txt b/tests/fixtures/coverage-reports/instantiations/instantiations.txt index 162a77c5..4d16eb8e 100644 --- a/tests/fixtures/coverage-reports/instantiations/instantiations.txt +++ b/tests/fixtures/coverage-reports/instantiations/instantiations.txt @@ -27,7 +27,7 @@ | 9| 1|} ------------------ 10| | - 11| 1|#[test] + 11| |#[test] 12| 1|fn test() { 13| 1| assert!(!func(1_f32)); 14| 1| assert!(func(-1_i32)); diff --git a/tests/fixtures/coverage-reports/merge/clean_ws.codecov.json b/tests/fixtures/coverage-reports/merge/clean_ws.codecov.json index d52e7981..302b58c8 100644 --- a/tests/fixtures/coverage-reports/merge/clean_ws.codecov.json +++ b/tests/fixtures/coverage-reports/merge/clean_ws.codecov.json @@ -1 +1 @@ -{"coverage":{"src/lib.rs":{"1":"1/1","2":"1/1","3":"0/1","5":"1/1","7":"1/1","9":"1/1","10":"1/1","11":"1/1","12":"1/1","15":"1/1"}}} \ No newline at end of file +{"coverage":{"src/lib.rs":{"1":"1/1","2":"1/1","3":"0/1","5":"1/1","7":"1/1","10":"1/1","11":"1/1","12":"1/1","15":"1/1"}}} \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/merge/clean_ws.hide-instantiations.txt b/tests/fixtures/coverage-reports/merge/clean_ws.hide-instantiations.txt index 1efcb68b..5afea72f 100644 --- a/tests/fixtures/coverage-reports/merge/clean_ws.hide-instantiations.txt +++ b/tests/fixtures/coverage-reports/merge/clean_ws.hide-instantiations.txt @@ -6,7 +6,7 @@ 6| | } 7| 1|} 8| | - 9| 1|#[test] + 9| |#[test] 10| 1|fn test() { 11| 1| #[cfg(feature = "a")] 12| 1| assert!(!func(1)); diff --git a/tests/fixtures/coverage-reports/merge/clean_ws.json b/tests/fixtures/coverage-reports/merge/clean_ws.json index b5dcd0e4..d5fb97b7 100644 --- a/tests/fixtures/coverage-reports/merge/clean_ws.json +++ b/tests/fixtures/coverage-reports/merge/clean_ws.json @@ -12,25 +12,25 @@ "percent": 0.0 }, "functions": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100.0 }, "instantiations": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100.0 }, "lines": { - "count": 10, - "covered": 9, - "percent": 90.0 + "count": 9, + "covered": 8, + "percent": 88.88888888888889 }, "regions": { - "count": 7, - "covered": 6, + "count": 6, + "covered": 5, "notcovered": 1, - "percent": 85.71428571428571 + "percent": 83.33333333333334 } } } @@ -43,25 +43,25 @@ "percent": 0 }, "functions": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100 }, "instantiations": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100 }, "lines": { - "count": 10, - "covered": 9, - "percent": 90 + "count": 9, + "covered": 8, + "percent": 88.88888888888889 }, "regions": { - "count": 7, - "covered": 6, + "count": 6, + "covered": 5, "notcovered": 1, - "percent": 85.71428571428571 + "percent": 83.33333333333334 } } } diff --git a/tests/fixtures/coverage-reports/merge/clean_ws.lcov.info b/tests/fixtures/coverage-reports/merge/clean_ws.lcov.info index 71936f3f..327f72ba 100644 --- a/tests/fixtures/coverage-reports/merge/clean_ws.lcov.info +++ b/tests/fixtures/coverage-reports/merge/clean_ws.lcov.info @@ -1,8 +1,8 @@ SF:src/lib.rs -FNF:3 -FNH:3 +FNF:2 +FNH:2 BRF:0 BRH:0 -LF:10 -LH:9 +LF:9 +LH:8 end_of_record \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/merge/clean_ws.summary.txt b/tests/fixtures/coverage-reports/merge/clean_ws.summary.txt index 65cdcfdf..1c3342d9 100644 --- a/tests/fixtures/coverage-reports/merge/clean_ws.summary.txt +++ b/tests/fixtures/coverage-reports/merge/clean_ws.summary.txt @@ -1,5 +1,5 @@ Filename Regions Missed Regions Cover Functions Missed Functions Executed Lines Missed Lines Cover Branches Missed Branches Cover ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -src/lib.rs 7 1 85.71% 3 0 100.00% 10 1 90.00% 0 0 - +src/lib.rs 6 1 83.33% 2 0 100.00% 9 1 88.89% 0 0 - ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -TOTAL 7 1 85.71% 3 0 100.00% 10 1 90.00% 0 0 - \ No newline at end of file +TOTAL 6 1 83.33% 2 0 100.00% 9 1 88.89% 0 0 - \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/merge/clean_ws.txt b/tests/fixtures/coverage-reports/merge/clean_ws.txt index 1efcb68b..5afea72f 100644 --- a/tests/fixtures/coverage-reports/merge/clean_ws.txt +++ b/tests/fixtures/coverage-reports/merge/clean_ws.txt @@ -6,7 +6,7 @@ 6| | } 7| 1|} 8| | - 9| 1|#[test] + 9| |#[test] 10| 1|fn test() { 11| 1| #[cfg(feature = "a")] 12| 1| assert!(!func(1)); diff --git a/tests/fixtures/coverage-reports/merge/merge.codecov.json b/tests/fixtures/coverage-reports/merge/merge.codecov.json index 7460f444..e48a171c 100644 --- a/tests/fixtures/coverage-reports/merge/merge.codecov.json +++ b/tests/fixtures/coverage-reports/merge/merge.codecov.json @@ -1 +1 @@ -{"coverage":{"src/lib.rs":{"1":"1/1","2":"1/1","3":"1/1","5":"1/1","7":"1/1","9":"1/1","10":"2/2","11":"2/2","12":"2/2","13":"1/1","14":"1/1","15":"1/1"}}} \ No newline at end of file +{"coverage":{"src/lib.rs":{"1":"1/1","2":"1/1","3":"1/1","5":"1/1","7":"1/1","10":"2/2","11":"2/2","12":"2/2","13":"1/1","14":"1/1","15":"1/1"}}} \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/merge/merge.hide-instantiations.txt b/tests/fixtures/coverage-reports/merge/merge.hide-instantiations.txt index 8dc385c1..420e41ad 100644 --- a/tests/fixtures/coverage-reports/merge/merge.hide-instantiations.txt +++ b/tests/fixtures/coverage-reports/merge/merge.hide-instantiations.txt @@ -6,7 +6,7 @@ 6| | } 7| 2|} 8| | - 9| 2|#[test] + 9| |#[test] 10| 1|fn test() { 11| 1| #[cfg(feature = "a")] 12| 1| assert!(!func(1)); diff --git a/tests/fixtures/coverage-reports/merge/merge.json b/tests/fixtures/coverage-reports/merge/merge.json index 5491407c..9adbc714 100644 --- a/tests/fixtures/coverage-reports/merge/merge.json +++ b/tests/fixtures/coverage-reports/merge/merge.json @@ -12,25 +12,25 @@ "percent": 0.0 }, "functions": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100.0 }, "instantiations": { - "count": 6, - "covered": 6, + "count": 4, + "covered": 4, "percent": 100.0 }, "lines": { - "count": 12, - "covered": 11, - "percent": 91.66666666666666 + "count": 11, + "covered": 10, + "percent": 90.9090909090909 }, "regions": { - "count": 7, - "covered": 6, + "count": 6, + "covered": 5, "notcovered": 1, - "percent": 85.71428571428571 + "percent": 83.33333333333334 } } } @@ -43,25 +43,25 @@ "percent": 0 }, "functions": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100 }, "instantiations": { - "count": 6, - "covered": 6, + "count": 4, + "covered": 4, "percent": 100 }, "lines": { - "count": 12, - "covered": 11, - "percent": 91.66666666666666 + "count": 11, + "covered": 10, + "percent": 90.9090909090909 }, "regions": { - "count": 7, - "covered": 6, + "count": 6, + "covered": 5, "notcovered": 1, - "percent": 85.71428571428571 + "percent": 83.33333333333334 } } } diff --git a/tests/fixtures/coverage-reports/merge/merge.lcov.info b/tests/fixtures/coverage-reports/merge/merge.lcov.info index 33741b5a..14baec68 100644 --- a/tests/fixtures/coverage-reports/merge/merge.lcov.info +++ b/tests/fixtures/coverage-reports/merge/merge.lcov.info @@ -1,8 +1,8 @@ SF:src/lib.rs -FNF:3 -FNH:3 +FNF:2 +FNH:2 BRF:0 BRH:0 -LF:12 -LH:11 +LF:11 +LH:10 end_of_record \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/merge/merge.summary.txt b/tests/fixtures/coverage-reports/merge/merge.summary.txt index 6d5a9ce6..5738cdcd 100644 --- a/tests/fixtures/coverage-reports/merge/merge.summary.txt +++ b/tests/fixtures/coverage-reports/merge/merge.summary.txt @@ -1,5 +1,5 @@ Filename Regions Missed Regions Cover Functions Missed Functions Executed Lines Missed Lines Cover Branches Missed Branches Cover ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -src/lib.rs 7 1 85.71% 3 0 100.00% 12 1 91.67% 0 0 - +src/lib.rs 6 1 83.33% 2 0 100.00% 11 1 90.91% 0 0 - ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -TOTAL 7 1 85.71% 3 0 100.00% 12 1 91.67% 0 0 - \ No newline at end of file +TOTAL 6 1 83.33% 2 0 100.00% 11 1 90.91% 0 0 - \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/merge/merge.txt b/tests/fixtures/coverage-reports/merge/merge.txt index 8e2f25b6..98fad323 100644 --- a/tests/fixtures/coverage-reports/merge/merge.txt +++ b/tests/fixtures/coverage-reports/merge/merge.txt @@ -25,14 +25,7 @@ | 7| 1|} ------------------ 8| | - 9| 2|#[test] - ------------------ - | merge::test::{closure#0}: - | 9| 1|#[test] - ------------------ - | merge::test::{closure#0}: - | 9| 1|#[test] - ------------------ + 9| |#[test] 10| 1|fn test() { 11| 1| #[cfg(feature = "a")] 12| 1| assert!(!func(1)); diff --git a/tests/fixtures/coverage-reports/no_coverage/no_cfg_coverage.codecov.json b/tests/fixtures/coverage-reports/no_coverage/no_cfg_coverage.codecov.json index 4d62546f..7464eb83 100644 --- a/tests/fixtures/coverage-reports/no_coverage/no_cfg_coverage.codecov.json +++ b/tests/fixtures/coverage-reports/no_coverage/no_cfg_coverage.codecov.json @@ -1 +1 @@ -{"coverage":{"src/lib.rs":{"3":"1/1","4":"1/1","5":"1/1","6":"0/1","7":"0/1","8":"0/1","9":"0/1","11":"1/1","14":"1/1","15":"1/1","16":"1/1","17":"1/1","18":"1/2","19":"0/1","20":"1/2","21":"1/1","24":"1/1","25":"1/1","26":"1/2","27":"0/1","28":"0/1","29":"1/2","30":"1/1","37":"1/1","38":"1/1","39":"1/2","40":"0/1","41":"1/2","42":"1/1"}}} \ No newline at end of file +{"coverage":{"src/lib.rs":{"3":"1/1","4":"1/1","5":"1/1","6":"0/1","7":"0/1","8":"0/1","9":"0/1","11":"1/1","15":"1/1","16":"1/1","17":"1/1","18":"1/2","19":"0/1","20":"1/2","21":"1/1","25":"1/1","26":"1/2","27":"0/1","28":"0/1","29":"1/2","30":"1/1","38":"1/1","39":"1/2","40":"0/1","41":"1/2","42":"1/1"}}} \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/no_coverage/no_cfg_coverage.hide-instantiations.txt b/tests/fixtures/coverage-reports/no_coverage/no_cfg_coverage.hide-instantiations.txt index 2bb6aae8..5bd55290 100644 --- a/tests/fixtures/coverage-reports/no_coverage/no_cfg_coverage.hide-instantiations.txt +++ b/tests/fixtures/coverage-reports/no_coverage/no_cfg_coverage.hide-instantiations.txt @@ -11,7 +11,7 @@ 11| 1|} 12| | 13| |#[cfg_attr(coverage, coverage(off))] - 14| 1|#[test] + 14| |#[test] 15| 1|fn fn_level() { 16| 1| func(0); 17| 1| @@ -21,7 +21,7 @@ 21| 1|} 22| | 23| |// #[coverage(off)] has no effect on expressions. - 24| 1|#[test] + 24| |#[test] 25| 1|fn expr_level() { 26| 1| if false { 27| 0| #[cfg_attr(coverage, coverage(off))] @@ -34,7 +34,7 @@ 34| |mod mod_level { 35| | use super::func; 36| | - 37| 1| #[test] + 37| | #[test] 38| 1| fn mod_level() { 39| 1| if false { 40| 0| func(3); diff --git a/tests/fixtures/coverage-reports/no_coverage/no_cfg_coverage.json b/tests/fixtures/coverage-reports/no_coverage/no_cfg_coverage.json index 4cb09fba..21afd03b 100644 --- a/tests/fixtures/coverage-reports/no_coverage/no_cfg_coverage.json +++ b/tests/fixtures/coverage-reports/no_coverage/no_cfg_coverage.json @@ -12,25 +12,25 @@ "percent": 0.0 }, "functions": { - "count": 7, - "covered": 7, + "count": 4, + "covered": 4, "percent": 100.0 }, "instantiations": { - "count": 7, - "covered": 7, + "count": 4, + "covered": 4, "percent": 100.0 }, "lines": { - "count": 29, - "covered": 21, - "percent": 72.41379310344827 + "count": 26, + "covered": 18, + "percent": 69.23076923076923 }, "regions": { - "count": 22, - "covered": 15, + "count": 19, + "covered": 12, "notcovered": 7, - "percent": 68.18181818181817 + "percent": 63.1578947368421 } } } @@ -43,25 +43,25 @@ "percent": 0 }, "functions": { - "count": 7, - "covered": 7, + "count": 4, + "covered": 4, "percent": 100 }, "instantiations": { - "count": 7, - "covered": 7, + "count": 4, + "covered": 4, "percent": 100 }, "lines": { - "count": 29, - "covered": 21, - "percent": 72.41379310344827 + "count": 26, + "covered": 18, + "percent": 69.23076923076923 }, "regions": { - "count": 22, - "covered": 15, + "count": 19, + "covered": 12, "notcovered": 7, - "percent": 68.18181818181817 + "percent": 63.1578947368421 } } } diff --git a/tests/fixtures/coverage-reports/no_coverage/no_cfg_coverage.lcov.info b/tests/fixtures/coverage-reports/no_coverage/no_cfg_coverage.lcov.info index 4761fa26..a0f631a8 100644 --- a/tests/fixtures/coverage-reports/no_coverage/no_cfg_coverage.lcov.info +++ b/tests/fixtures/coverage-reports/no_coverage/no_cfg_coverage.lcov.info @@ -1,8 +1,8 @@ SF:src/lib.rs -FNF:7 -FNH:7 +FNF:4 +FNH:4 BRF:0 BRH:0 -LF:29 -LH:21 +LF:26 +LH:18 end_of_record \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/no_coverage/no_cfg_coverage.summary.txt b/tests/fixtures/coverage-reports/no_coverage/no_cfg_coverage.summary.txt index 586bd278..32e14f81 100644 --- a/tests/fixtures/coverage-reports/no_coverage/no_cfg_coverage.summary.txt +++ b/tests/fixtures/coverage-reports/no_coverage/no_cfg_coverage.summary.txt @@ -1,5 +1,5 @@ Filename Regions Missed Regions Cover Functions Missed Functions Executed Lines Missed Lines Cover Branches Missed Branches Cover ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -src/lib.rs 22 7 68.18% 7 0 100.00% 29 8 72.41% 0 0 - +src/lib.rs 19 7 63.16% 4 0 100.00% 26 8 69.23% 0 0 - ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -TOTAL 22 7 68.18% 7 0 100.00% 29 8 72.41% 0 0 - \ No newline at end of file +TOTAL 19 7 63.16% 4 0 100.00% 26 8 69.23% 0 0 - \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/no_coverage/no_cfg_coverage.txt b/tests/fixtures/coverage-reports/no_coverage/no_cfg_coverage.txt index 2bb6aae8..5bd55290 100644 --- a/tests/fixtures/coverage-reports/no_coverage/no_cfg_coverage.txt +++ b/tests/fixtures/coverage-reports/no_coverage/no_cfg_coverage.txt @@ -11,7 +11,7 @@ 11| 1|} 12| | 13| |#[cfg_attr(coverage, coverage(off))] - 14| 1|#[test] + 14| |#[test] 15| 1|fn fn_level() { 16| 1| func(0); 17| 1| @@ -21,7 +21,7 @@ 21| 1|} 22| | 23| |// #[coverage(off)] has no effect on expressions. - 24| 1|#[test] + 24| |#[test] 25| 1|fn expr_level() { 26| 1| if false { 27| 0| #[cfg_attr(coverage, coverage(off))] @@ -34,7 +34,7 @@ 34| |mod mod_level { 35| | use super::func; 36| | - 37| 1| #[test] + 37| | #[test] 38| 1| fn mod_level() { 39| 1| if false { 40| 0| func(3); diff --git a/tests/fixtures/coverage-reports/no_coverage/no_coverage.codecov.json b/tests/fixtures/coverage-reports/no_coverage/no_coverage.codecov.json index e1f3d48c..86aaa4ec 100644 --- a/tests/fixtures/coverage-reports/no_coverage/no_coverage.codecov.json +++ b/tests/fixtures/coverage-reports/no_coverage/no_coverage.codecov.json @@ -1 +1 @@ -{"coverage":{"src/lib.rs":{"3":"1/1","4":"1/1","5":"1/1","6":"0/1","7":"0/1","8":"0/1","9":"0/1","11":"1/1","14":"1/1","24":"1/1","25":"1/1","26":"1/2","27":"0/1","28":"0/1","29":"1/2","30":"1/1","37":"1/1","38":"1/1","39":"1/2","40":"0/1","41":"1/2","42":"1/1"}}} \ No newline at end of file +{"coverage":{"src/lib.rs":{"3":"1/1","4":"1/1","5":"1/1","6":"0/1","7":"0/1","8":"0/1","9":"0/1","11":"1/1","25":"1/1","26":"1/2","27":"0/1","28":"0/1","29":"1/2","30":"1/1","38":"1/1","39":"1/2","40":"0/1","41":"1/2","42":"1/1"}}} \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/no_coverage/no_coverage.hide-instantiations.txt b/tests/fixtures/coverage-reports/no_coverage/no_coverage.hide-instantiations.txt index 64b2bca6..77222c7f 100644 --- a/tests/fixtures/coverage-reports/no_coverage/no_coverage.hide-instantiations.txt +++ b/tests/fixtures/coverage-reports/no_coverage/no_coverage.hide-instantiations.txt @@ -11,7 +11,7 @@ 11| 1|} 12| | 13| |#[cfg_attr(coverage, coverage(off))] - 14| 1|#[test] + 14| |#[test] 15| |fn fn_level() { 16| | func(0); 17| | @@ -21,7 +21,7 @@ 21| |} 22| | 23| |// #[coverage(off)] has no effect on expressions. - 24| 1|#[test] + 24| |#[test] 25| 1|fn expr_level() { 26| 1| if false { 27| 0| #[cfg_attr(coverage, coverage(off))] @@ -34,7 +34,7 @@ 34| |mod mod_level { 35| | use super::func; 36| | - 37| 1| #[test] + 37| | #[test] 38| 1| fn mod_level() { 39| 1| if false { 40| 0| func(3); diff --git a/tests/fixtures/coverage-reports/no_coverage/no_coverage.json b/tests/fixtures/coverage-reports/no_coverage/no_coverage.json index 8e0c825f..620c7ca9 100644 --- a/tests/fixtures/coverage-reports/no_coverage/no_coverage.json +++ b/tests/fixtures/coverage-reports/no_coverage/no_coverage.json @@ -12,25 +12,25 @@ "percent": 0.0 }, "functions": { - "count": 6, - "covered": 6, + "count": 3, + "covered": 3, "percent": 100.0 }, "instantiations": { - "count": 6, - "covered": 6, + "count": 3, + "covered": 3, "percent": 100.0 }, "lines": { - "count": 22, - "covered": 15, - "percent": 68.18181818181817 + "count": 19, + "covered": 12, + "percent": 63.1578947368421 }, "regions": { - "count": 18, - "covered": 12, + "count": 15, + "covered": 9, "notcovered": 6, - "percent": 66.66666666666666 + "percent": 60.0 } } } @@ -43,25 +43,25 @@ "percent": 0 }, "functions": { - "count": 6, - "covered": 6, + "count": 3, + "covered": 3, "percent": 100 }, "instantiations": { - "count": 6, - "covered": 6, + "count": 3, + "covered": 3, "percent": 100 }, "lines": { - "count": 22, - "covered": 15, - "percent": 68.18181818181817 + "count": 19, + "covered": 12, + "percent": 63.1578947368421 }, "regions": { - "count": 18, - "covered": 12, + "count": 15, + "covered": 9, "notcovered": 6, - "percent": 66.66666666666666 + "percent": 60 } } } diff --git a/tests/fixtures/coverage-reports/no_coverage/no_coverage.lcov.info b/tests/fixtures/coverage-reports/no_coverage/no_coverage.lcov.info index a289d3ce..8975bdf4 100644 --- a/tests/fixtures/coverage-reports/no_coverage/no_coverage.lcov.info +++ b/tests/fixtures/coverage-reports/no_coverage/no_coverage.lcov.info @@ -1,8 +1,8 @@ SF:src/lib.rs -FNF:6 -FNH:6 +FNF:3 +FNH:3 BRF:0 BRH:0 -LF:22 -LH:15 +LF:19 +LH:12 end_of_record \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/no_coverage/no_coverage.summary.txt b/tests/fixtures/coverage-reports/no_coverage/no_coverage.summary.txt index acdab183..4147a24b 100644 --- a/tests/fixtures/coverage-reports/no_coverage/no_coverage.summary.txt +++ b/tests/fixtures/coverage-reports/no_coverage/no_coverage.summary.txt @@ -1,5 +1,5 @@ Filename Regions Missed Regions Cover Functions Missed Functions Executed Lines Missed Lines Cover Branches Missed Branches Cover ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -src/lib.rs 18 6 66.67% 6 0 100.00% 22 7 68.18% 0 0 - +src/lib.rs 15 6 60.00% 3 0 100.00% 19 7 63.16% 0 0 - ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -TOTAL 18 6 66.67% 6 0 100.00% 22 7 68.18% 0 0 - \ No newline at end of file +TOTAL 15 6 60.00% 3 0 100.00% 19 7 63.16% 0 0 - \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/no_coverage/no_coverage.txt b/tests/fixtures/coverage-reports/no_coverage/no_coverage.txt index 64b2bca6..77222c7f 100644 --- a/tests/fixtures/coverage-reports/no_coverage/no_coverage.txt +++ b/tests/fixtures/coverage-reports/no_coverage/no_coverage.txt @@ -11,7 +11,7 @@ 11| 1|} 12| | 13| |#[cfg_attr(coverage, coverage(off))] - 14| 1|#[test] + 14| |#[test] 15| |fn fn_level() { 16| | func(0); 17| | @@ -21,7 +21,7 @@ 21| |} 22| | 23| |// #[coverage(off)] has no effect on expressions. - 24| 1|#[test] + 24| |#[test] 25| 1|fn expr_level() { 26| 1| if false { 27| 0| #[cfg_attr(coverage, coverage(off))] @@ -34,7 +34,7 @@ 34| |mod mod_level { 35| | use super::func; 36| | - 37| 1| #[test] + 37| | #[test] 38| 1| fn mod_level() { 39| 1| if false { 40| 0| func(3); diff --git a/tests/fixtures/coverage-reports/no_test/link_dead_code.codecov.json b/tests/fixtures/coverage-reports/no_test/link_dead_code.codecov.json index abe31c20..c2ada87a 100644 --- a/tests/fixtures/coverage-reports/no_test/link_dead_code.codecov.json +++ b/tests/fixtures/coverage-reports/no_test/link_dead_code.codecov.json @@ -1 +1 @@ -{"coverage":{"src/lib.rs":{"4":"1/1","5":"1/1"},"src/module.rs":{"1":"0/1","2":"0/1","3":"0/1","4":"0/1","5":"0/1","6":"0/1","8":"0/1"}}} \ No newline at end of file +{"coverage":{"src/lib.rs":{"5":"1/1"},"src/module.rs":{"1":"0/1","2":"0/1","3":"0/1","4":"0/1","5":"0/1","6":"0/1","8":"0/1"}}} \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/no_test/link_dead_code.hide-instantiations.txt b/tests/fixtures/coverage-reports/no_test/link_dead_code.hide-instantiations.txt index 54e58117..27f51fe0 100644 --- a/tests/fixtures/coverage-reports/no_test/link_dead_code.hide-instantiations.txt +++ b/tests/fixtures/coverage-reports/no_test/link_dead_code.hide-instantiations.txt @@ -2,7 +2,7 @@ src/lib.rs: 1| |mod module; 2| |pub use module::*; 3| | - 4| 1|#[test] + 4| |#[test] 5| 1|fn f() {} src/module.rs: diff --git a/tests/fixtures/coverage-reports/no_test/link_dead_code.json b/tests/fixtures/coverage-reports/no_test/link_dead_code.json index 3f14af7d..853e8b80 100644 --- a/tests/fixtures/coverage-reports/no_test/link_dead_code.json +++ b/tests/fixtures/coverage-reports/no_test/link_dead_code.json @@ -12,23 +12,23 @@ "percent": 0.0 }, "functions": { - "count": 2, - "covered": 2, + "count": 1, + "covered": 1, "percent": 100.0 }, "instantiations": { - "count": 2, - "covered": 2, + "count": 1, + "covered": 1, "percent": 100.0 }, "lines": { - "count": 2, - "covered": 2, + "count": 1, + "covered": 1, "percent": 100.0 }, "regions": { - "count": 2, - "covered": 2, + "count": 1, + "covered": 1, "notcovered": 0, "percent": 100.0 } @@ -75,25 +75,25 @@ "percent": 0 }, "functions": { - "count": 3, - "covered": 2, - "percent": 66.66666666666666 + "count": 2, + "covered": 1, + "percent": 50 }, "instantiations": { - "count": 3, - "covered": 2, - "percent": 66.66666666666666 + "count": 2, + "covered": 1, + "percent": 50 }, "lines": { - "count": 9, - "covered": 2, - "percent": 22.22222222222222 + "count": 8, + "covered": 1, + "percent": 12.5 }, "regions": { - "count": 8, - "covered": 2, + "count": 7, + "covered": 1, "notcovered": 6, - "percent": 25 + "percent": 14.285714285714285 } } } diff --git a/tests/fixtures/coverage-reports/no_test/link_dead_code.lcov.info b/tests/fixtures/coverage-reports/no_test/link_dead_code.lcov.info index 5c12cec7..ba702330 100644 --- a/tests/fixtures/coverage-reports/no_test/link_dead_code.lcov.info +++ b/tests/fixtures/coverage-reports/no_test/link_dead_code.lcov.info @@ -1,10 +1,10 @@ SF:src/lib.rs -FNF:2 -FNH:2 +FNF:1 +FNH:1 BRF:0 BRH:0 -LF:2 -LH:2 +LF:1 +LH:1 end_of_record SF:src/module.rs FNF:1 diff --git a/tests/fixtures/coverage-reports/no_test/link_dead_code.summary.txt b/tests/fixtures/coverage-reports/no_test/link_dead_code.summary.txt index cf768a9c..7d1b26db 100644 --- a/tests/fixtures/coverage-reports/no_test/link_dead_code.summary.txt +++ b/tests/fixtures/coverage-reports/no_test/link_dead_code.summary.txt @@ -1,6 +1,6 @@ Filename Regions Missed Regions Cover Functions Missed Functions Executed Lines Missed Lines Cover Branches Missed Branches Cover ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -lib.rs 2 0 100.00% 2 0 100.00% 2 0 100.00% 0 0 - +lib.rs 1 0 100.00% 1 0 100.00% 1 0 100.00% 0 0 - module.rs 6 6 0.00% 1 1 0.00% 7 7 0.00% 0 0 - ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -TOTAL 8 6 25.00% 3 1 66.67% 9 7 22.22% 0 0 - \ No newline at end of file +TOTAL 7 6 14.29% 2 1 50.00% 8 7 12.50% 0 0 - \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/no_test/link_dead_code.txt b/tests/fixtures/coverage-reports/no_test/link_dead_code.txt index 54e58117..27f51fe0 100644 --- a/tests/fixtures/coverage-reports/no_test/link_dead_code.txt +++ b/tests/fixtures/coverage-reports/no_test/link_dead_code.txt @@ -2,7 +2,7 @@ src/lib.rs: 1| |mod module; 2| |pub use module::*; 3| | - 4| 1|#[test] + 4| |#[test] 5| 1|fn f() {} src/module.rs: diff --git a/tests/fixtures/coverage-reports/no_test/no_test.codecov.json b/tests/fixtures/coverage-reports/no_test/no_test.codecov.json index abe31c20..c2ada87a 100644 --- a/tests/fixtures/coverage-reports/no_test/no_test.codecov.json +++ b/tests/fixtures/coverage-reports/no_test/no_test.codecov.json @@ -1 +1 @@ -{"coverage":{"src/lib.rs":{"4":"1/1","5":"1/1"},"src/module.rs":{"1":"0/1","2":"0/1","3":"0/1","4":"0/1","5":"0/1","6":"0/1","8":"0/1"}}} \ No newline at end of file +{"coverage":{"src/lib.rs":{"5":"1/1"},"src/module.rs":{"1":"0/1","2":"0/1","3":"0/1","4":"0/1","5":"0/1","6":"0/1","8":"0/1"}}} \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/no_test/no_test.hide-instantiations.txt b/tests/fixtures/coverage-reports/no_test/no_test.hide-instantiations.txt index 54e58117..27f51fe0 100644 --- a/tests/fixtures/coverage-reports/no_test/no_test.hide-instantiations.txt +++ b/tests/fixtures/coverage-reports/no_test/no_test.hide-instantiations.txt @@ -2,7 +2,7 @@ src/lib.rs: 1| |mod module; 2| |pub use module::*; 3| | - 4| 1|#[test] + 4| |#[test] 5| 1|fn f() {} src/module.rs: diff --git a/tests/fixtures/coverage-reports/no_test/no_test.json b/tests/fixtures/coverage-reports/no_test/no_test.json index 3f14af7d..853e8b80 100644 --- a/tests/fixtures/coverage-reports/no_test/no_test.json +++ b/tests/fixtures/coverage-reports/no_test/no_test.json @@ -12,23 +12,23 @@ "percent": 0.0 }, "functions": { - "count": 2, - "covered": 2, + "count": 1, + "covered": 1, "percent": 100.0 }, "instantiations": { - "count": 2, - "covered": 2, + "count": 1, + "covered": 1, "percent": 100.0 }, "lines": { - "count": 2, - "covered": 2, + "count": 1, + "covered": 1, "percent": 100.0 }, "regions": { - "count": 2, - "covered": 2, + "count": 1, + "covered": 1, "notcovered": 0, "percent": 100.0 } @@ -75,25 +75,25 @@ "percent": 0 }, "functions": { - "count": 3, - "covered": 2, - "percent": 66.66666666666666 + "count": 2, + "covered": 1, + "percent": 50 }, "instantiations": { - "count": 3, - "covered": 2, - "percent": 66.66666666666666 + "count": 2, + "covered": 1, + "percent": 50 }, "lines": { - "count": 9, - "covered": 2, - "percent": 22.22222222222222 + "count": 8, + "covered": 1, + "percent": 12.5 }, "regions": { - "count": 8, - "covered": 2, + "count": 7, + "covered": 1, "notcovered": 6, - "percent": 25 + "percent": 14.285714285714285 } } } diff --git a/tests/fixtures/coverage-reports/no_test/no_test.lcov.info b/tests/fixtures/coverage-reports/no_test/no_test.lcov.info index 5c12cec7..ba702330 100644 --- a/tests/fixtures/coverage-reports/no_test/no_test.lcov.info +++ b/tests/fixtures/coverage-reports/no_test/no_test.lcov.info @@ -1,10 +1,10 @@ SF:src/lib.rs -FNF:2 -FNH:2 +FNF:1 +FNH:1 BRF:0 BRH:0 -LF:2 -LH:2 +LF:1 +LH:1 end_of_record SF:src/module.rs FNF:1 diff --git a/tests/fixtures/coverage-reports/no_test/no_test.summary.txt b/tests/fixtures/coverage-reports/no_test/no_test.summary.txt index cf768a9c..7d1b26db 100644 --- a/tests/fixtures/coverage-reports/no_test/no_test.summary.txt +++ b/tests/fixtures/coverage-reports/no_test/no_test.summary.txt @@ -1,6 +1,6 @@ Filename Regions Missed Regions Cover Functions Missed Functions Executed Lines Missed Lines Cover Branches Missed Branches Cover ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -lib.rs 2 0 100.00% 2 0 100.00% 2 0 100.00% 0 0 - +lib.rs 1 0 100.00% 1 0 100.00% 1 0 100.00% 0 0 - module.rs 6 6 0.00% 1 1 0.00% 7 7 0.00% 0 0 - ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -TOTAL 8 6 25.00% 3 1 66.67% 9 7 22.22% 0 0 - \ No newline at end of file +TOTAL 7 6 14.29% 2 1 50.00% 8 7 12.50% 0 0 - \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/no_test/no_test.txt b/tests/fixtures/coverage-reports/no_test/no_test.txt index 54e58117..27f51fe0 100644 --- a/tests/fixtures/coverage-reports/no_test/no_test.txt +++ b/tests/fixtures/coverage-reports/no_test/no_test.txt @@ -2,7 +2,7 @@ src/lib.rs: 1| |mod module; 2| |pub use module::*; 3| | - 4| 1|#[test] + 4| |#[test] 5| 1|fn f() {} src/module.rs: diff --git a/tests/fixtures/coverage-reports/real1/all.hide-instantiations.txt b/tests/fixtures/coverage-reports/real1/all.hide-instantiations.txt index c1ef7623..573cef3f 100644 --- a/tests/fixtures/coverage-reports/real1/all.hide-instantiations.txt +++ b/tests/fixtures/coverage-reports/real1/all.hide-instantiations.txt @@ -31,7 +31,7 @@ src/lib.rs: 10| | } 11| 4|} 12| | - 13| 1|#[test] + 13| |#[test] 14| 1|fn test() { 15| 1| func(1); 16| 1| func(3); diff --git a/tests/fixtures/coverage-reports/real1/all.json b/tests/fixtures/coverage-reports/real1/all.json index dab553a0..d03032be 100644 --- a/tests/fixtures/coverage-reports/real1/all.json +++ b/tests/fixtures/coverage-reports/real1/all.json @@ -76,25 +76,25 @@ "percent": 0.0 }, "functions": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100.0 }, "instantiations": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100.0 }, "lines": { - "count": 14, - "covered": 12, - "percent": 85.71428571428571 + "count": 13, + "covered": 11, + "percent": 84.61538461538461 }, "regions": { - "count": 8, - "covered": 6, + "count": 7, + "covered": 5, "notcovered": 2, - "percent": 75.0 + "percent": 71.42857142857143 } } } @@ -107,25 +107,25 @@ "percent": 0 }, "functions": { - "count": 5, - "covered": 5, + "count": 4, + "covered": 4, "percent": 100 }, "instantiations": { - "count": 7, - "covered": 5, - "percent": 71.42857142857143 + "count": 6, + "covered": 4, + "percent": 66.66666666666666 }, "lines": { - "count": 28, - "covered": 20, - "percent": 71.42857142857143 + "count": 27, + "covered": 19, + "percent": 70.37037037037037 }, "regions": { - "count": 20, - "covered": 12, + "count": 19, + "covered": 11, "notcovered": 8, - "percent": 60 + "percent": 57.89473684210527 } } } diff --git a/tests/fixtures/coverage-reports/real1/all.lcov.info b/tests/fixtures/coverage-reports/real1/all.lcov.info index 9d80061c..43eddff0 100644 --- a/tests/fixtures/coverage-reports/real1/all.lcov.info +++ b/tests/fixtures/coverage-reports/real1/all.lcov.info @@ -15,10 +15,10 @@ LF:7 LH:4 end_of_record SF:src/lib.rs -FNF:3 -FNH:3 +FNF:2 +FNH:2 BRF:0 BRH:0 -LF:14 -LH:12 +LF:13 +LH:11 end_of_record \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/real1/all.summary.txt b/tests/fixtures/coverage-reports/real1/all.summary.txt index 0c5ce30b..9c9d4e7d 100644 --- a/tests/fixtures/coverage-reports/real1/all.summary.txt +++ b/tests/fixtures/coverage-reports/real1/all.summary.txt @@ -2,6 +2,6 @@ Filename Regions Missed Regions Cover Functions ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ member1/member2/src/lib.rs 6 3 50.00% 1 0 100.00% 7 3 57.14% 0 0 - member1/src/lib.rs 6 3 50.00% 1 0 100.00% 7 3 57.14% 0 0 - -src/lib.rs 8 2 75.00% 3 0 100.00% 14 2 85.71% 0 0 - +src/lib.rs 7 2 71.43% 2 0 100.00% 13 2 84.62% 0 0 - ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -TOTAL 20 8 60.00% 5 0 100.00% 28 8 71.43% 0 0 - \ No newline at end of file +TOTAL 19 8 57.89% 4 0 100.00% 27 8 70.37% 0 0 - \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/real1/all.txt b/tests/fixtures/coverage-reports/real1/all.txt index 55cc0e92..335e2d5e 100644 --- a/tests/fixtures/coverage-reports/real1/all.txt +++ b/tests/fixtures/coverage-reports/real1/all.txt @@ -57,7 +57,7 @@ src/lib.rs: 10| | } 11| 4|} 12| | - 13| 1|#[test] + 13| |#[test] 14| 1|fn test() { 15| 1| func(1); 16| 1| func(3); diff --git a/tests/fixtures/coverage-reports/real1/workspace_root.codecov.json b/tests/fixtures/coverage-reports/real1/workspace_root.codecov.json index a3506751..a1487951 100644 --- a/tests/fixtures/coverage-reports/real1/workspace_root.codecov.json +++ b/tests/fixtures/coverage-reports/real1/workspace_root.codecov.json @@ -1 +1 @@ -{"coverage":{"member1/member2/src/lib.rs":{"1":"1/1","2":"1/1","3":"1/1","4":"0/1","5":"0/1","6":"0/1","8":"1/1"},"member1/src/lib.rs":{"1":"1/1","2":"1/1","3":"1/1","4":"0/1","5":"0/1","6":"0/1","8":"1/1"},"src/lib.rs":{"4":"1/1","5":"1/1","6":"0/1","7":"1/1","8":"0/1","9":"1/1","11":"1/1","13":"1/1","14":"1/1","15":"1/1","16":"1/1","17":"1/1","18":"1/1","19":"1/1"}}} \ No newline at end of file +{"coverage":{"member1/member2/src/lib.rs":{"1":"1/1","2":"1/1","3":"1/1","4":"0/1","5":"0/1","6":"0/1","8":"1/1"},"member1/src/lib.rs":{"1":"1/1","2":"1/1","3":"1/1","4":"0/1","5":"0/1","6":"0/1","8":"1/1"},"src/lib.rs":{"4":"1/1","5":"1/1","6":"0/1","7":"1/1","8":"0/1","9":"1/1","11":"1/1","14":"1/1","15":"1/1","16":"1/1","17":"1/1","18":"1/1","19":"1/1"}}} \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/real1/workspace_root.hide-instantiations.txt b/tests/fixtures/coverage-reports/real1/workspace_root.hide-instantiations.txt index c1ef7623..573cef3f 100644 --- a/tests/fixtures/coverage-reports/real1/workspace_root.hide-instantiations.txt +++ b/tests/fixtures/coverage-reports/real1/workspace_root.hide-instantiations.txt @@ -31,7 +31,7 @@ src/lib.rs: 10| | } 11| 4|} 12| | - 13| 1|#[test] + 13| |#[test] 14| 1|fn test() { 15| 1| func(1); 16| 1| func(3); diff --git a/tests/fixtures/coverage-reports/real1/workspace_root.json b/tests/fixtures/coverage-reports/real1/workspace_root.json index 89e7b705..ba822000 100644 --- a/tests/fixtures/coverage-reports/real1/workspace_root.json +++ b/tests/fixtures/coverage-reports/real1/workspace_root.json @@ -76,25 +76,25 @@ "percent": 0.0 }, "functions": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100.0 }, "instantiations": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100.0 }, "lines": { - "count": 14, - "covered": 12, - "percent": 85.71428571428571 + "count": 13, + "covered": 11, + "percent": 84.61538461538461 }, "regions": { - "count": 8, - "covered": 6, + "count": 7, + "covered": 5, "notcovered": 2, - "percent": 75.0 + "percent": 71.42857142857143 } } } @@ -107,25 +107,25 @@ "percent": 0 }, "functions": { - "count": 5, - "covered": 5, + "count": 4, + "covered": 4, "percent": 100 }, "instantiations": { - "count": 5, - "covered": 5, + "count": 4, + "covered": 4, "percent": 100 }, "lines": { - "count": 28, - "covered": 20, - "percent": 71.42857142857143 + "count": 27, + "covered": 19, + "percent": 70.37037037037037 }, "regions": { - "count": 20, - "covered": 12, + "count": 19, + "covered": 11, "notcovered": 8, - "percent": 60 + "percent": 57.89473684210527 } } } diff --git a/tests/fixtures/coverage-reports/real1/workspace_root.lcov.info b/tests/fixtures/coverage-reports/real1/workspace_root.lcov.info index 9d80061c..43eddff0 100644 --- a/tests/fixtures/coverage-reports/real1/workspace_root.lcov.info +++ b/tests/fixtures/coverage-reports/real1/workspace_root.lcov.info @@ -15,10 +15,10 @@ LF:7 LH:4 end_of_record SF:src/lib.rs -FNF:3 -FNH:3 +FNF:2 +FNH:2 BRF:0 BRH:0 -LF:14 -LH:12 +LF:13 +LH:11 end_of_record \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/real1/workspace_root.summary.txt b/tests/fixtures/coverage-reports/real1/workspace_root.summary.txt index 0c5ce30b..9c9d4e7d 100644 --- a/tests/fixtures/coverage-reports/real1/workspace_root.summary.txt +++ b/tests/fixtures/coverage-reports/real1/workspace_root.summary.txt @@ -2,6 +2,6 @@ Filename Regions Missed Regions Cover Functions ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ member1/member2/src/lib.rs 6 3 50.00% 1 0 100.00% 7 3 57.14% 0 0 - member1/src/lib.rs 6 3 50.00% 1 0 100.00% 7 3 57.14% 0 0 - -src/lib.rs 8 2 75.00% 3 0 100.00% 14 2 85.71% 0 0 - +src/lib.rs 7 2 71.43% 2 0 100.00% 13 2 84.62% 0 0 - ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -TOTAL 20 8 60.00% 5 0 100.00% 28 8 71.43% 0 0 - \ No newline at end of file +TOTAL 19 8 57.89% 4 0 100.00% 27 8 70.37% 0 0 - \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/real1/workspace_root.txt b/tests/fixtures/coverage-reports/real1/workspace_root.txt index c1ef7623..573cef3f 100644 --- a/tests/fixtures/coverage-reports/real1/workspace_root.txt +++ b/tests/fixtures/coverage-reports/real1/workspace_root.txt @@ -31,7 +31,7 @@ src/lib.rs: 10| | } 11| 4|} 12| | - 13| 1|#[test] + 13| |#[test] 14| 1|fn test() { 15| 1| func(1); 16| 1| func(3); diff --git a/tests/fixtures/coverage-reports/virtual1/package1.codecov.json b/tests/fixtures/coverage-reports/virtual1/package1.codecov.json index 462fd1d9..fa849d7a 100644 --- a/tests/fixtures/coverage-reports/virtual1/package1.codecov.json +++ b/tests/fixtures/coverage-reports/virtual1/package1.codecov.json @@ -1 +1 @@ -{"coverage":{"member1/src/lib.rs":{"1":"1/1","2":"1/1","3":"0/1","4":"1/1","5":"0/1","6":"1/1","8":"1/1","10":"1/1","11":"1/1","12":"1/1","13":"1/1","14":"1/1","15":"1/1","16":"1/1","17":"1/1"},"member2/member3/src/lib.rs":{"1":"1/1","2":"1/1","3":"1/1","4":"0/1","5":"0/1","6":"0/1","8":"1/1"},"member2/src/lib.rs":{"1":"1/1","2":"1/1","3":"1/1","4":"0/1","5":"0/1","6":"0/1","8":"1/1","10":"0/1","11":"0/1","12":"0/1","13":"0/1","14":"0/1","15":"0/1","17":"0/1"},"member2/src/member4/src/lib.rs":{"1":"1/1","2":"1/1","3":"1/1","4":"0/1","5":"0/1","6":"0/1","8":"1/1"}}} \ No newline at end of file +{"coverage":{"member1/src/lib.rs":{"1":"1/1","2":"1/1","3":"0/1","4":"1/1","5":"0/1","6":"1/1","8":"1/1","11":"1/1","12":"1/1","13":"1/1","14":"1/1","15":"1/1","16":"1/1","17":"1/1"},"member2/member3/src/lib.rs":{"1":"1/1","2":"1/1","3":"1/1","4":"0/1","5":"0/1","6":"0/1","8":"1/1"},"member2/src/lib.rs":{"1":"1/1","2":"1/1","3":"1/1","4":"0/1","5":"0/1","6":"0/1","8":"1/1","10":"0/1","11":"0/1","12":"0/1","13":"0/1","14":"0/1","15":"0/1","17":"0/1"},"member2/src/member4/src/lib.rs":{"1":"1/1","2":"1/1","3":"1/1","4":"0/1","5":"0/1","6":"0/1","8":"1/1"}}} \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/virtual1/package1.hide-instantiations.txt b/tests/fixtures/coverage-reports/virtual1/package1.hide-instantiations.txt index e87c0f3a..0dbfae76 100644 --- a/tests/fixtures/coverage-reports/virtual1/package1.hide-instantiations.txt +++ b/tests/fixtures/coverage-reports/virtual1/package1.hide-instantiations.txt @@ -8,7 +8,7 @@ member1/src/lib.rs: 7| | } 8| 2|} 9| | - 10| 1|#[test] + 10| |#[test] 11| 1|fn test() { 12| 1| func(1); 13| 1| func(3); diff --git a/tests/fixtures/coverage-reports/virtual1/package1.json b/tests/fixtures/coverage-reports/virtual1/package1.json index 394810d3..65286166 100644 --- a/tests/fixtures/coverage-reports/virtual1/package1.json +++ b/tests/fixtures/coverage-reports/virtual1/package1.json @@ -12,25 +12,25 @@ "percent": 0.0 }, "functions": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100.0 }, "instantiations": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100.0 }, "lines": { - "count": 15, - "covered": 13, - "percent": 86.66666666666667 + "count": 14, + "covered": 12, + "percent": 85.71428571428571 }, "regions": { - "count": 8, - "covered": 6, + "count": 7, + "covered": 5, "notcovered": 2, - "percent": 75.0 + "percent": 71.42857142857143 } } }, @@ -139,25 +139,25 @@ "percent": 0 }, "functions": { - "count": 7, - "covered": 6, - "percent": 85.71428571428571 + "count": 6, + "covered": 5, + "percent": 83.33333333333334 }, "instantiations": { - "count": 7, - "covered": 6, - "percent": 85.71428571428571 + "count": 6, + "covered": 5, + "percent": 83.33333333333334 }, "lines": { - "count": 43, - "covered": 25, - "percent": 58.139534883720934 + "count": 42, + "covered": 24, + "percent": 57.14285714285714 }, "regions": { - "count": 32, - "covered": 15, + "count": 31, + "covered": 14, "notcovered": 17, - "percent": 46.875 + "percent": 45.16129032258064 } } } diff --git a/tests/fixtures/coverage-reports/virtual1/package1.lcov.info b/tests/fixtures/coverage-reports/virtual1/package1.lcov.info index d5a8a630..59b9cec8 100644 --- a/tests/fixtures/coverage-reports/virtual1/package1.lcov.info +++ b/tests/fixtures/coverage-reports/virtual1/package1.lcov.info @@ -1,10 +1,10 @@ SF:member1/src/lib.rs -FNF:3 -FNH:3 +FNF:2 +FNH:2 BRF:0 BRH:0 -LF:15 -LH:13 +LF:14 +LH:12 end_of_record SF:member2/member3/src/lib.rs FNF:1 diff --git a/tests/fixtures/coverage-reports/virtual1/package1.summary.txt b/tests/fixtures/coverage-reports/virtual1/package1.summary.txt index e28fe624..acfb66e6 100644 --- a/tests/fixtures/coverage-reports/virtual1/package1.summary.txt +++ b/tests/fixtures/coverage-reports/virtual1/package1.summary.txt @@ -1,8 +1,8 @@ Filename Regions Missed Regions Cover Functions Missed Functions Executed Lines Missed Lines Cover Branches Missed Branches Cover ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -member1/src/lib.rs 8 2 75.00% 3 0 100.00% 15 2 86.67% 0 0 - +member1/src/lib.rs 7 2 71.43% 2 0 100.00% 14 2 85.71% 0 0 - member2/member3/src/lib.rs 6 3 50.00% 1 0 100.00% 7 3 57.14% 0 0 - member2/src/lib.rs 12 9 25.00% 2 1 50.00% 14 10 28.57% 0 0 - member2/src/member4/src/lib.rs 6 3 50.00% 1 0 100.00% 7 3 57.14% 0 0 - ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -TOTAL 32 17 46.88% 7 1 85.71% 43 18 58.14% 0 0 - \ No newline at end of file +TOTAL 31 17 45.16% 6 1 83.33% 42 18 57.14% 0 0 - \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/virtual1/package1.txt b/tests/fixtures/coverage-reports/virtual1/package1.txt index e87c0f3a..0dbfae76 100644 --- a/tests/fixtures/coverage-reports/virtual1/package1.txt +++ b/tests/fixtures/coverage-reports/virtual1/package1.txt @@ -8,7 +8,7 @@ member1/src/lib.rs: 7| | } 8| 2|} 9| | - 10| 1|#[test] + 10| |#[test] 11| 1|fn test() { 12| 1| func(1); 13| 1| func(3); diff --git a/tests/fixtures/coverage-reports/virtual1/package2.codecov.json b/tests/fixtures/coverage-reports/virtual1/package2.codecov.json index 8314140c..adcd9643 100644 --- a/tests/fixtures/coverage-reports/virtual1/package2.codecov.json +++ b/tests/fixtures/coverage-reports/virtual1/package2.codecov.json @@ -1 +1 @@ -{"coverage":{"member1/src/lib.rs":{"1":"1/1","2":"1/1","3":"0/1","4":"1/1","5":"0/1","6":"1/1","8":"1/1","10":"1/1","11":"1/1","12":"1/1","13":"1/1","14":"1/1","15":"1/1","16":"1/1","17":"1/1"},"member2/member3/src/lib.rs":{"1":"1/1","2":"1/1","3":"1/1","4":"0/1","5":"0/1","6":"0/1","8":"1/1"},"member2/src/lib.rs":{"1":"1/1","2":"1/1","3":"1/1","4":"0/1","5":"0/1","6":"0/1","8":"1/1","10":"1/1","11":"1/1","12":"1/1","13":"0/1","14":"1/1","15":"0/1","17":"1/1","19":"1/1","20":"1/1","21":"1/1","22":"1/1","23":"1/1"},"member2/src/member4/src/lib.rs":{"1":"1/1","2":"1/1","3":"1/1","4":"0/1","5":"0/1","6":"0/1","8":"1/1"}}} \ No newline at end of file +{"coverage":{"member1/src/lib.rs":{"1":"1/1","2":"1/1","3":"0/1","4":"1/1","5":"0/1","6":"1/1","8":"1/1","11":"1/1","12":"1/1","13":"1/1","14":"1/1","15":"1/1","16":"1/1","17":"1/1"},"member2/member3/src/lib.rs":{"1":"1/1","2":"1/1","3":"1/1","4":"0/1","5":"0/1","6":"0/1","8":"1/1"},"member2/src/lib.rs":{"1":"1/1","2":"1/1","3":"1/1","4":"0/1","5":"0/1","6":"0/1","8":"1/1","10":"1/1","11":"1/1","12":"1/1","13":"0/1","14":"1/1","15":"0/1","17":"1/1","20":"1/1","21":"1/1","22":"1/1","23":"1/1"},"member2/src/member4/src/lib.rs":{"1":"1/1","2":"1/1","3":"1/1","4":"0/1","5":"0/1","6":"0/1","8":"1/1"}}} \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/virtual1/package2.hide-instantiations.txt b/tests/fixtures/coverage-reports/virtual1/package2.hide-instantiations.txt index 517d8798..167f6ce2 100644 --- a/tests/fixtures/coverage-reports/virtual1/package2.hide-instantiations.txt +++ b/tests/fixtures/coverage-reports/virtual1/package2.hide-instantiations.txt @@ -8,7 +8,7 @@ member1/src/lib.rs: 7| | } 8| 2|} 9| | - 10| 1|#[test] + 10| |#[test] 11| 1|fn test() { 12| 1| func(1); 13| 1| func(3); @@ -46,7 +46,7 @@ member2/src/lib.rs: 16| | } 17| 2|} 18| | - 19| 1|#[test] + 19| |#[test] 20| 1|fn test() { 21| 1| func2(0); 22| 1| func2(2); diff --git a/tests/fixtures/coverage-reports/virtual1/package2.json b/tests/fixtures/coverage-reports/virtual1/package2.json index 2166e1ed..60058885 100644 --- a/tests/fixtures/coverage-reports/virtual1/package2.json +++ b/tests/fixtures/coverage-reports/virtual1/package2.json @@ -12,25 +12,25 @@ "percent": 0.0 }, "functions": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100.0 }, "instantiations": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100.0 }, "lines": { - "count": 15, - "covered": 13, - "percent": 86.66666666666667 + "count": 14, + "covered": 12, + "percent": 85.71428571428571 }, "regions": { - "count": 8, - "covered": 6, + "count": 7, + "covered": 5, "notcovered": 2, - "percent": 75.0 + "percent": 71.42857142857143 } } }, @@ -76,25 +76,25 @@ "percent": 0.0 }, "functions": { - "count": 4, - "covered": 4, + "count": 3, + "covered": 3, "percent": 100.0 }, "instantiations": { - "count": 6, - "covered": 4, - "percent": 66.66666666666666 + "count": 5, + "covered": 3, + "percent": 60.0 }, "lines": { - "count": 19, - "covered": 14, - "percent": 73.68421052631578 + "count": 18, + "covered": 13, + "percent": 72.22222222222221 }, "regions": { - "count": 14, - "covered": 9, + "count": 13, + "covered": 8, "notcovered": 5, - "percent": 64.28571428571429 + "percent": 61.53846153846154 } } }, @@ -139,25 +139,25 @@ "percent": 0 }, "functions": { - "count": 9, - "covered": 9, + "count": 7, + "covered": 7, "percent": 100 }, "instantiations": { - "count": 11, - "covered": 9, - "percent": 81.81818181818183 + "count": 9, + "covered": 7, + "percent": 77.77777777777779 }, "lines": { - "count": 48, - "covered": 35, - "percent": 72.91666666666666 + "count": 46, + "covered": 33, + "percent": 71.73913043478261 }, "regions": { - "count": 34, - "covered": 21, + "count": 32, + "covered": 19, "notcovered": 13, - "percent": 61.76470588235294 + "percent": 59.375 } } } diff --git a/tests/fixtures/coverage-reports/virtual1/package2.lcov.info b/tests/fixtures/coverage-reports/virtual1/package2.lcov.info index f1d7e08d..8bca14ee 100644 --- a/tests/fixtures/coverage-reports/virtual1/package2.lcov.info +++ b/tests/fixtures/coverage-reports/virtual1/package2.lcov.info @@ -1,10 +1,10 @@ SF:member1/src/lib.rs -FNF:3 -FNH:3 +FNF:2 +FNH:2 BRF:0 BRH:0 -LF:15 -LH:13 +LF:14 +LH:12 end_of_record SF:member2/member3/src/lib.rs FNF:1 @@ -15,12 +15,12 @@ LF:7 LH:4 end_of_record SF:member2/src/lib.rs -FNF:4 -FNH:4 +FNF:3 +FNH:3 BRF:0 BRH:0 -LF:19 -LH:14 +LF:18 +LH:13 end_of_record SF:member2/src/member4/src/lib.rs FNF:1 diff --git a/tests/fixtures/coverage-reports/virtual1/package2.summary.txt b/tests/fixtures/coverage-reports/virtual1/package2.summary.txt index ee4141de..ba23a378 100644 --- a/tests/fixtures/coverage-reports/virtual1/package2.summary.txt +++ b/tests/fixtures/coverage-reports/virtual1/package2.summary.txt @@ -1,8 +1,8 @@ Filename Regions Missed Regions Cover Functions Missed Functions Executed Lines Missed Lines Cover Branches Missed Branches Cover ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -member1/src/lib.rs 8 2 75.00% 3 0 100.00% 15 2 86.67% 0 0 - +member1/src/lib.rs 7 2 71.43% 2 0 100.00% 14 2 85.71% 0 0 - member2/member3/src/lib.rs 6 3 50.00% 1 0 100.00% 7 3 57.14% 0 0 - -member2/src/lib.rs 14 5 64.29% 4 0 100.00% 19 5 73.68% 0 0 - +member2/src/lib.rs 13 5 61.54% 3 0 100.00% 18 5 72.22% 0 0 - member2/src/member4/src/lib.rs 6 3 50.00% 1 0 100.00% 7 3 57.14% 0 0 - ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -TOTAL 34 13 61.76% 9 0 100.00% 48 13 72.92% 0 0 - \ No newline at end of file +TOTAL 32 13 59.38% 7 0 100.00% 46 13 71.74% 0 0 - \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/virtual1/package2.txt b/tests/fixtures/coverage-reports/virtual1/package2.txt index 0734b45a..1edea0ba 100644 --- a/tests/fixtures/coverage-reports/virtual1/package2.txt +++ b/tests/fixtures/coverage-reports/virtual1/package2.txt @@ -8,7 +8,7 @@ member1/src/lib.rs: 7| | } 8| 2|} 9| | - 10| 1|#[test] + 10| |#[test] 11| 1|fn test() { 12| 1| func(1); 13| 1| func(3); @@ -72,7 +72,7 @@ member2/src/lib.rs: | 17| 2|} ------------------ 18| | - 19| 1|#[test] + 19| |#[test] 20| 1|fn test() { 21| 1| func2(0); 22| 1| func2(2); diff --git a/tests/fixtures/coverage-reports/virtual1/package3.codecov.json b/tests/fixtures/coverage-reports/virtual1/package3.codecov.json index bafac3f0..52226e7d 100644 --- a/tests/fixtures/coverage-reports/virtual1/package3.codecov.json +++ b/tests/fixtures/coverage-reports/virtual1/package3.codecov.json @@ -1 +1 @@ -{"coverage":{"member2/src/lib.rs":{"1":"0/1","2":"0/1","3":"0/1","4":"0/1","5":"0/1","6":"0/1","8":"0/1","10":"1/1","11":"1/1","12":"1/1","13":"0/1","14":"1/1","15":"0/1","17":"1/1","19":"1/1","20":"1/1","21":"1/1","22":"1/1","23":"1/1"}}} \ No newline at end of file +{"coverage":{"member2/src/lib.rs":{"1":"0/1","2":"0/1","3":"0/1","4":"0/1","5":"0/1","6":"0/1","8":"0/1","10":"1/1","11":"1/1","12":"1/1","13":"0/1","14":"1/1","15":"0/1","17":"1/1","20":"1/1","21":"1/1","22":"1/1","23":"1/1"}}} \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/virtual1/package3.hide-instantiations.txt b/tests/fixtures/coverage-reports/virtual1/package3.hide-instantiations.txt index 2596c989..9d3d7131 100644 --- a/tests/fixtures/coverage-reports/virtual1/package3.hide-instantiations.txt +++ b/tests/fixtures/coverage-reports/virtual1/package3.hide-instantiations.txt @@ -16,7 +16,7 @@ 16| | } 17| 2|} 18| | - 19| 1|#[test] + 19| |#[test] 20| 1|fn test() { 21| 1| func2(0); 22| 1| func2(2); diff --git a/tests/fixtures/coverage-reports/virtual1/package3.json b/tests/fixtures/coverage-reports/virtual1/package3.json index e6ac93b3..d43d578c 100644 --- a/tests/fixtures/coverage-reports/virtual1/package3.json +++ b/tests/fixtures/coverage-reports/virtual1/package3.json @@ -12,25 +12,25 @@ "percent": 0.0 }, "functions": { - "count": 4, - "covered": 3, - "percent": 75.0 + "count": 3, + "covered": 2, + "percent": 66.66666666666666 }, "instantiations": { - "count": 4, - "covered": 3, - "percent": 75.0 + "count": 3, + "covered": 2, + "percent": 66.66666666666666 }, "lines": { - "count": 19, - "covered": 10, - "percent": 52.63157894736842 + "count": 18, + "covered": 9, + "percent": 50.0 }, "regions": { - "count": 14, - "covered": 6, + "count": 13, + "covered": 5, "notcovered": 8, - "percent": 42.857142857142854 + "percent": 38.46153846153847 } } } @@ -43,25 +43,25 @@ "percent": 0 }, "functions": { - "count": 4, - "covered": 3, - "percent": 75 + "count": 3, + "covered": 2, + "percent": 66.66666666666666 }, "instantiations": { - "count": 4, - "covered": 3, - "percent": 75 + "count": 3, + "covered": 2, + "percent": 66.66666666666666 }, "lines": { - "count": 19, - "covered": 10, - "percent": 52.63157894736842 + "count": 18, + "covered": 9, + "percent": 50 }, "regions": { - "count": 14, - "covered": 6, + "count": 13, + "covered": 5, "notcovered": 8, - "percent": 42.857142857142854 + "percent": 38.46153846153847 } } } diff --git a/tests/fixtures/coverage-reports/virtual1/package3.lcov.info b/tests/fixtures/coverage-reports/virtual1/package3.lcov.info index 22667277..ebb7a2c1 100644 --- a/tests/fixtures/coverage-reports/virtual1/package3.lcov.info +++ b/tests/fixtures/coverage-reports/virtual1/package3.lcov.info @@ -1,8 +1,8 @@ SF:member2/src/lib.rs -FNF:4 -FNH:3 +FNF:3 +FNH:2 BRF:0 BRH:0 -LF:19 -LH:10 +LF:18 +LH:9 end_of_record \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/virtual1/package3.summary.txt b/tests/fixtures/coverage-reports/virtual1/package3.summary.txt index b5fab512..87bdfe0f 100644 --- a/tests/fixtures/coverage-reports/virtual1/package3.summary.txt +++ b/tests/fixtures/coverage-reports/virtual1/package3.summary.txt @@ -1,5 +1,5 @@ Filename Regions Missed Regions Cover Functions Missed Functions Executed Lines Missed Lines Cover Branches Missed Branches Cover ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -member2/src/lib.rs 14 8 42.86% 4 1 75.00% 19 9 52.63% 0 0 - +member2/src/lib.rs 13 8 38.46% 3 1 66.67% 18 9 50.00% 0 0 - ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -TOTAL 14 8 42.86% 4 1 75.00% 19 9 52.63% 0 0 - \ No newline at end of file +TOTAL 13 8 38.46% 3 1 66.67% 18 9 50.00% 0 0 - \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/virtual1/package3.txt b/tests/fixtures/coverage-reports/virtual1/package3.txt index 2596c989..9d3d7131 100644 --- a/tests/fixtures/coverage-reports/virtual1/package3.txt +++ b/tests/fixtures/coverage-reports/virtual1/package3.txt @@ -16,7 +16,7 @@ 16| | } 17| 2|} 18| | - 19| 1|#[test] + 19| |#[test] 20| 1|fn test() { 21| 1| func2(0); 22| 1| func2(2); diff --git a/tests/fixtures/coverage-reports/virtual1/workspace_root.codecov.json b/tests/fixtures/coverage-reports/virtual1/workspace_root.codecov.json index 8314140c..adcd9643 100644 --- a/tests/fixtures/coverage-reports/virtual1/workspace_root.codecov.json +++ b/tests/fixtures/coverage-reports/virtual1/workspace_root.codecov.json @@ -1 +1 @@ -{"coverage":{"member1/src/lib.rs":{"1":"1/1","2":"1/1","3":"0/1","4":"1/1","5":"0/1","6":"1/1","8":"1/1","10":"1/1","11":"1/1","12":"1/1","13":"1/1","14":"1/1","15":"1/1","16":"1/1","17":"1/1"},"member2/member3/src/lib.rs":{"1":"1/1","2":"1/1","3":"1/1","4":"0/1","5":"0/1","6":"0/1","8":"1/1"},"member2/src/lib.rs":{"1":"1/1","2":"1/1","3":"1/1","4":"0/1","5":"0/1","6":"0/1","8":"1/1","10":"1/1","11":"1/1","12":"1/1","13":"0/1","14":"1/1","15":"0/1","17":"1/1","19":"1/1","20":"1/1","21":"1/1","22":"1/1","23":"1/1"},"member2/src/member4/src/lib.rs":{"1":"1/1","2":"1/1","3":"1/1","4":"0/1","5":"0/1","6":"0/1","8":"1/1"}}} \ No newline at end of file +{"coverage":{"member1/src/lib.rs":{"1":"1/1","2":"1/1","3":"0/1","4":"1/1","5":"0/1","6":"1/1","8":"1/1","11":"1/1","12":"1/1","13":"1/1","14":"1/1","15":"1/1","16":"1/1","17":"1/1"},"member2/member3/src/lib.rs":{"1":"1/1","2":"1/1","3":"1/1","4":"0/1","5":"0/1","6":"0/1","8":"1/1"},"member2/src/lib.rs":{"1":"1/1","2":"1/1","3":"1/1","4":"0/1","5":"0/1","6":"0/1","8":"1/1","10":"1/1","11":"1/1","12":"1/1","13":"0/1","14":"1/1","15":"0/1","17":"1/1","20":"1/1","21":"1/1","22":"1/1","23":"1/1"},"member2/src/member4/src/lib.rs":{"1":"1/1","2":"1/1","3":"1/1","4":"0/1","5":"0/1","6":"0/1","8":"1/1"}}} \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/virtual1/workspace_root.hide-instantiations.txt b/tests/fixtures/coverage-reports/virtual1/workspace_root.hide-instantiations.txt index 517d8798..167f6ce2 100644 --- a/tests/fixtures/coverage-reports/virtual1/workspace_root.hide-instantiations.txt +++ b/tests/fixtures/coverage-reports/virtual1/workspace_root.hide-instantiations.txt @@ -8,7 +8,7 @@ member1/src/lib.rs: 7| | } 8| 2|} 9| | - 10| 1|#[test] + 10| |#[test] 11| 1|fn test() { 12| 1| func(1); 13| 1| func(3); @@ -46,7 +46,7 @@ member2/src/lib.rs: 16| | } 17| 2|} 18| | - 19| 1|#[test] + 19| |#[test] 20| 1|fn test() { 21| 1| func2(0); 22| 1| func2(2); diff --git a/tests/fixtures/coverage-reports/virtual1/workspace_root.json b/tests/fixtures/coverage-reports/virtual1/workspace_root.json index 1bf2d203..fdfa2081 100644 --- a/tests/fixtures/coverage-reports/virtual1/workspace_root.json +++ b/tests/fixtures/coverage-reports/virtual1/workspace_root.json @@ -12,25 +12,25 @@ "percent": 0.0 }, "functions": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100.0 }, "instantiations": { - "count": 3, - "covered": 3, + "count": 2, + "covered": 2, "percent": 100.0 }, "lines": { - "count": 15, - "covered": 13, - "percent": 86.66666666666667 + "count": 14, + "covered": 12, + "percent": 85.71428571428571 }, "regions": { - "count": 8, - "covered": 6, + "count": 7, + "covered": 5, "notcovered": 2, - "percent": 75.0 + "percent": 71.42857142857143 } } }, @@ -76,25 +76,25 @@ "percent": 0.0 }, "functions": { - "count": 4, - "covered": 4, + "count": 3, + "covered": 3, "percent": 100.0 }, "instantiations": { - "count": 6, - "covered": 4, - "percent": 66.66666666666666 + "count": 5, + "covered": 3, + "percent": 60.0 }, "lines": { - "count": 19, - "covered": 14, - "percent": 73.68421052631578 + "count": 18, + "covered": 13, + "percent": 72.22222222222221 }, "regions": { - "count": 14, - "covered": 9, + "count": 13, + "covered": 8, "notcovered": 5, - "percent": 64.28571428571429 + "percent": 61.53846153846154 } } }, @@ -139,25 +139,25 @@ "percent": 0 }, "functions": { - "count": 9, - "covered": 9, + "count": 7, + "covered": 7, "percent": 100 }, "instantiations": { - "count": 13, - "covered": 9, - "percent": 69.23076923076923 + "count": 11, + "covered": 7, + "percent": 63.63636363636363 }, "lines": { - "count": 48, - "covered": 35, - "percent": 72.91666666666666 + "count": 46, + "covered": 33, + "percent": 71.73913043478261 }, "regions": { - "count": 34, - "covered": 21, + "count": 32, + "covered": 19, "notcovered": 13, - "percent": 61.76470588235294 + "percent": 59.375 } } } diff --git a/tests/fixtures/coverage-reports/virtual1/workspace_root.lcov.info b/tests/fixtures/coverage-reports/virtual1/workspace_root.lcov.info index f1d7e08d..8bca14ee 100644 --- a/tests/fixtures/coverage-reports/virtual1/workspace_root.lcov.info +++ b/tests/fixtures/coverage-reports/virtual1/workspace_root.lcov.info @@ -1,10 +1,10 @@ SF:member1/src/lib.rs -FNF:3 -FNH:3 +FNF:2 +FNH:2 BRF:0 BRH:0 -LF:15 -LH:13 +LF:14 +LH:12 end_of_record SF:member2/member3/src/lib.rs FNF:1 @@ -15,12 +15,12 @@ LF:7 LH:4 end_of_record SF:member2/src/lib.rs -FNF:4 -FNH:4 +FNF:3 +FNH:3 BRF:0 BRH:0 -LF:19 -LH:14 +LF:18 +LH:13 end_of_record SF:member2/src/member4/src/lib.rs FNF:1 diff --git a/tests/fixtures/coverage-reports/virtual1/workspace_root.summary.txt b/tests/fixtures/coverage-reports/virtual1/workspace_root.summary.txt index ee4141de..ba23a378 100644 --- a/tests/fixtures/coverage-reports/virtual1/workspace_root.summary.txt +++ b/tests/fixtures/coverage-reports/virtual1/workspace_root.summary.txt @@ -1,8 +1,8 @@ Filename Regions Missed Regions Cover Functions Missed Functions Executed Lines Missed Lines Cover Branches Missed Branches Cover ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -member1/src/lib.rs 8 2 75.00% 3 0 100.00% 15 2 86.67% 0 0 - +member1/src/lib.rs 7 2 71.43% 2 0 100.00% 14 2 85.71% 0 0 - member2/member3/src/lib.rs 6 3 50.00% 1 0 100.00% 7 3 57.14% 0 0 - -member2/src/lib.rs 14 5 64.29% 4 0 100.00% 19 5 73.68% 0 0 - +member2/src/lib.rs 13 5 61.54% 3 0 100.00% 18 5 72.22% 0 0 - member2/src/member4/src/lib.rs 6 3 50.00% 1 0 100.00% 7 3 57.14% 0 0 - ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -TOTAL 34 13 61.76% 9 0 100.00% 48 13 72.92% 0 0 - \ No newline at end of file +TOTAL 32 13 59.38% 7 0 100.00% 46 13 71.74% 0 0 - \ No newline at end of file diff --git a/tests/fixtures/coverage-reports/virtual1/workspace_root.txt b/tests/fixtures/coverage-reports/virtual1/workspace_root.txt index e6381a7d..bdda5476 100644 --- a/tests/fixtures/coverage-reports/virtual1/workspace_root.txt +++ b/tests/fixtures/coverage-reports/virtual1/workspace_root.txt @@ -8,7 +8,7 @@ member1/src/lib.rs: 7| | } 8| 2|} 9| | - 10| 1|#[test] + 10| |#[test] 11| 1|fn test() { 12| 1| func(1); 13| 1| func(3); @@ -85,7 +85,7 @@ member2/src/lib.rs: | 17| 2|} ------------------ 18| | - 19| 1|#[test] + 19| |#[test] 20| 1|fn test() { 21| 1| func2(0); 22| 1| func2(2); diff --git a/tests/test.rs b/tests/test.rs index 692d871f..48bf8700 100644 --- a/tests/test.rs +++ b/tests/test.rs @@ -42,6 +42,8 @@ fn run(model: &str, name: &str, args: &[&str], envs: &[(&str, &str)]) { // TODO: // - add tests for non-crates.io dependencies +// nightly-2024-01-25 fixed bug in report generation, so the latest report is not the same as the old report. +#[rustversion::attr(before(1.77), ignore)] #[test] fn real1() { run("real1", "workspace_root", &[], &[]); @@ -51,6 +53,8 @@ fn real1() { run("real1", "exclude", &["--all", "--exclude", "crate1"], &[]); } +// nightly-2024-01-25 fixed bug in report generation, so the latest report is not the same as the old report. +#[rustversion::attr(before(1.77), ignore)] #[test] fn virtual1() { run("virtual1", "workspace_root", &[], &[]); @@ -78,6 +82,8 @@ fn virtual1() { run("virtual1", "exclude-from-test2", &["--workspace", "--exclude-from-test", "member2"], &[]); } +// nightly-2024-01-25 fixed bug in report generation, so the latest report is not the same as the old report. +#[rustversion::attr(before(1.77), ignore)] #[test] fn no_test() { run("no_test", "no_test", &[], &[]); @@ -100,16 +106,16 @@ fn bin_crate() { } } -// nightly-2023-12-10 fixed bug in report generation, so the latest report is not the same as the old report. -#[rustversion::attr(before(1.76), ignore)] +// nightly-2024-01-25 fixed bug in report generation, so the latest report is not the same as the old report. +#[rustversion::attr(before(1.77), ignore)] #[test] fn instantiations() { // TODO: fix https://github.com/taiki-e/cargo-llvm-cov/issues/43 run("instantiations", "instantiations", &[], &[]); } -// nightly-2023-12-10 fixed bug in report generation, so the latest report is not the same as the old report. -#[rustversion::attr(before(1.76), ignore)] +// nightly-2024-01-25 fixed bug in report generation, so the latest report is not the same as the old report. +#[rustversion::attr(before(1.77), ignore)] #[test] fn cargo_config() { run("cargo_config", "cargo_config", &[], &[]); @@ -214,8 +220,8 @@ fn merge_with_failure_mode(output_dir: &Path, failure_mode_all: bool) { } } -// nightly-2023-12-10 fixed bug in report generation, so the latest report is not the same as the old report. -#[rustversion::attr(before(1.76), ignore)] +// nightly-2024-01-25 fixed bug in report generation, so the latest report is not the same as the old report. +#[rustversion::attr(before(1.77), ignore)] #[test] fn clean_ws() { let model = "merge";