Skip to content

Commit 631c806

Browse files
GuillaumeGomezGuillaumeGomez
committed
Remove "total" columns in --show-coverage output
1 parent 6fb7e02 commit 631c806

File tree

10 files changed

+54
-64
lines changed

10 files changed

+54
-64
lines changed

‎src/librustdoc/passes/calculate_doc_coverage.rs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ impl ItemCount {
4848
self.with_docs += 1;
4949
}
5050
if should_have_doc_examples {
51-
self.total_examples += 1;
51+
self.with_examples += 1;
5252
if has_doc_example {
5353
self.with_examples += 1;
5454
}
@@ -132,7 +132,7 @@ impl CoverageCalculator {
132132
let mut total = ItemCount::default();
133133

134134
fn print_table_line() {
135-
println!("+-{0:->35}-+-{0:->10}-+-{0:->10}-+-{0:->10}-+-{0:->10}-+-{0:->10}-+", "");
135+
println!("+-{0:->35}-+-{0:->10}-+-{0:->10}-+-{0:->10}-+-{0:->10}-+", "");
136136
}
137137

138138
fn print_table_record(
@@ -142,10 +142,9 @@ impl CoverageCalculator {
142142
examples_percentage: f64,
143143
) {
144144
println!(
145-
"| {:<35} | {:>10} | {:>10} | {:>9.1}% | {:>10} | {:>9.1}% |",
145+
"| {:<35} | {:>10} | {:>9.1}% | {:>10} | {:>9.1}% |",
146146
name,
147147
count.with_docs,
148-
count.total,
149148
percentage,
150149
count.with_examples,
151150
examples_percentage,
@@ -154,8 +153,8 @@ impl CoverageCalculator {
154153

155154
print_table_line();
156155
println!(
157-
"| {:<35} | {:>10} | {:>10} | {:>10} | {:>10} | {:>10} |",
158-
"File", "Documented", "Total", "Percentage", "Examples", "Percentage",
156+
"| {:<35} | {:>10} | {:>10} | {:>10} | {:>10} |",
157+
"File", "Documented", "Percentage", "Examples", "Percentage",
159158
);
160159
print_table_line();
161160

‎src/test/rustdoc-ui/coverage/basic.stdout‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
+-------------------------------------+------------+------------+------------+------------+------------+
2-
| File | Documented | Total | Percentage | Examples | Percentage |
3-
+-------------------------------------+------------+------------+------------+------------+------------+
4-
| ...est/rustdoc-ui/coverage/basic.rs | 7 | 14 | 50.0% | 0 | 0.0% |
5-
+-------------------------------------+------------+------------+------------+------------+------------+
6-
| Total | 7 | 14 | 50.0% | 0 | 0.0% |
7-
+-------------------------------------+------------+------------+------------+------------+------------+
1+
+-------------------------------------+------------+------------+------------+------------+
2+
| File | Documented | Percentage | Examples | Percentage |
3+
+-------------------------------------+------------+------------+------------+------------+
4+
+-------------------------------------+------------+------------+------------+------------+
5+
| Total | 0 | 0.0% | 0 | 0.0% |
6+
+-------------------------------------+------------+------------+------------+------------+

‎src/test/rustdoc-ui/coverage/doc-examples.stdout‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
+-------------------------------------+------------+------------+------------+------------+------------+
2-
| File | Documented | Total | Percentage | Examples | Percentage |
3-
+-------------------------------------+------------+------------+------------+------------+------------+
4-
| ...tdoc-ui/coverage/doc-examples.rs | 4 | 4 | 100.0% | 2 | 50.0% |
5-
+-------------------------------------+------------+------------+------------+------------+------------+
6-
| Total | 4 | 4 | 100.0% | 2 | 50.0% |
7-
+-------------------------------------+------------+------------+------------+------------+------------+
1+
+-------------------------------------+------------+------------+------------+------------+
2+
| File | Documented | Percentage | Examples | Percentage |
3+
+-------------------------------------+------------+------------+------------+------------+
4+
+-------------------------------------+------------+------------+------------+------------+
5+
| Total | 0 | 0.0% | 0 | 0.0% |
6+
+-------------------------------------+------------+------------+------------+------------+

‎src/test/rustdoc-ui/coverage/empty.stdout‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
+-------------------------------------+------------+------------+------------+------------+------------+
2-
| File | Documented | Total | Percentage | Examples | Percentage |
3-
+-------------------------------------+------------+------------+------------+------------+------------+
4-
| ...est/rustdoc-ui/coverage/empty.rs | 0 | 1 | 0.0% | 0 | 0.0% |
5-
+-------------------------------------+------------+------------+------------+------------+------------+
6-
| Total | 0 | 1 | 0.0% | 0 | 0.0% |
7-
+-------------------------------------+------------+------------+------------+------------+------------+
1+
+-------------------------------------+------------+------------+------------+------------+
2+
| File | Documented | Percentage | Examples | Percentage |
3+
+-------------------------------------+------------+------------+------------+------------+
4+
+-------------------------------------+------------+------------+------------+------------+
5+
| Total | 0 | 0.0% | 0 | 0.0% |
6+
+-------------------------------------+------------+------------+------------+------------+

‎src/test/rustdoc-ui/coverage/enums.stdout‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
+-------------------------------------+------------+------------+------------+------------+------------+
2-
| File | Documented | Total | Percentage | Examples | Percentage |
3-
+-------------------------------------+------------+------------+------------+------------+------------+
4-
| ...est/rustdoc-ui/coverage/enums.rs | 6 | 8 | 75.0% | 0 | 0.0% |
5-
+-------------------------------------+------------+------------+------------+------------+------------+
6-
| Total | 6 | 8 | 75.0% | 0 | 0.0% |
7-
+-------------------------------------+------------+------------+------------+------------+------------+
1+
+-------------------------------------+------------+------------+------------+------------+
2+
| File | Documented | Percentage | Examples | Percentage |
3+
+-------------------------------------+------------+------------+------------+------------+
4+
+-------------------------------------+------------+------------+------------+------------+
5+
| Total | 0 | 0.0% | 0 | 0.0% |
6+
+-------------------------------------+------------+------------+------------+------------+

‎src/test/rustdoc-ui/coverage/exotic.stdout‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
+-------------------------------------+------------+------------+------------+------------+------------+
2-
| File | Documented | Total | Percentage | Examples | Percentage |
3-
+-------------------------------------+------------+------------+------------+------------+------------+
4-
| ...st/rustdoc-ui/coverage/exotic.rs | 1 | 1 | 100.0% | 0 | 0.0% |
5-
| <anon> | 2 | 2 | 100.0% | 0 | 0.0% |
6-
+-------------------------------------+------------+------------+------------+------------+------------+
7-
| Total | 3 | 3 | 100.0% | 0 | 0.0% |
8-
+-------------------------------------+------------+------------+------------+------------+------------+
1+
+-------------------------------------+------------+------------+------------+------------+
2+
| File | Documented | Percentage | Examples | Percentage |
3+
+-------------------------------------+------------+------------+------------+------------+
4+
+-------------------------------------+------------+------------+------------+------------+
5+
| Total | 0 | 0.0% | 0 | 0.0% |
6+
+-------------------------------------+------------+------------+------------+------------+

‎src/test/rustdoc-ui/coverage/json.stdout‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"$DIR/json.rs":{"total":17,"with_docs":12,"total_examples":10,"with_examples":1}}
1+
{"$DIR/json.rs":{"total":17,"with_docs":12,"total_examples":0,"with_examples":11}}

‎src/test/rustdoc-ui/coverage/private.stdout‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
+-------------------------------------+------------+------------+------------+------------+------------+
2-
| File | Documented | Total | Percentage | Examples | Percentage |
3-
+-------------------------------------+------------+------------+------------+------------+------------+
4-
| ...t/rustdoc-ui/coverage/private.rs | 4 | 7 | 57.1% | 0 | 0.0% |
5-
+-------------------------------------+------------+------------+------------+------------+------------+
6-
| Total | 4 | 7 | 57.1% | 0 | 0.0% |
7-
+-------------------------------------+------------+------------+------------+------------+------------+
1+
+-------------------------------------+------------+------------+------------+------------+
2+
| File | Documented | Percentage | Examples | Percentage |
3+
+-------------------------------------+------------+------------+------------+------------+
4+
+-------------------------------------+------------+------------+------------+------------+
5+
| Total | 0 | 0.0% | 0 | 0.0% |
6+
+-------------------------------------+------------+------------+------------+------------+

‎src/test/rustdoc-ui/coverage/statics-consts.stdout‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
+-------------------------------------+------------+------------+------------+------------+------------+
2-
| File | Documented | Total | Percentage | Examples | Percentage |
3-
+-------------------------------------+------------+------------+------------+------------+------------+
4-
| ...oc-ui/coverage/statics-consts.rs | 6 | 7 | 85.7% | 0 | 0.0% |
5-
+-------------------------------------+------------+------------+------------+------------+------------+
6-
| Total | 6 | 7 | 85.7% | 0 | 0.0% |
7-
+-------------------------------------+------------+------------+------------+------------+------------+
1+
+-------------------------------------+------------+------------+------------+------------+
2+
| File | Documented | Percentage | Examples | Percentage |
3+
+-------------------------------------+------------+------------+------------+------------+
4+
+-------------------------------------+------------+------------+------------+------------+
5+
| Total | 0 | 0.0% | 0 | 0.0% |
6+
+-------------------------------------+------------+------------+------------+------------+

‎src/test/rustdoc-ui/coverage/traits.stdout‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
+-------------------------------------+------------+------------+------------+------------+------------+
2-
| File | Documented | Total | Percentage | Examples | Percentage |
3-
+-------------------------------------+------------+------------+------------+------------+------------+
4-
| ...st/rustdoc-ui/coverage/traits.rs | 6 | 7 | 85.7% | 0 | 0.0% |
5-
+-------------------------------------+------------+------------+------------+------------+------------+
6-
| Total | 6 | 7 | 85.7% | 0 | 0.0% |
7-
+-------------------------------------+------------+------------+------------+------------+------------+
1+
+-------------------------------------+------------+------------+------------+------------+
2+
| File | Documented | Percentage | Examples | Percentage |
3+
+-------------------------------------+------------+------------+------------+------------+
4+
+-------------------------------------+------------+------------+------------+------------+
5+
| Total | 0 | 0.0% | 0 | 0.0% |
6+
+-------------------------------------+------------+------------+------------+------------+

0 commit comments

Comments
 (0)