update rustdoc coverage tests with new table layout

8 files changed, 51 insertions, 80 deletions

diff --git a/src/test/rustdoc-ui/coverage/basic.stdout b/src/test/rustdoc-ui/coverage/basic.stdout
index 089ab6017d1..3e916606316 100644
--- a/src/test/rustdoc-ui/coverage/basic.stdout
+++ b/src/test/rustdoc-ui/coverage/basic.stdout
@@ -1,15 +1,7 @@
-+---------------------------+------------+------------+------------+
-| Item Type                 | Documented |      Total | Percentage |
-+---------------------------+------------+------------+------------+
-| Modules                   |          1 |          1 |     100.0% |
-| Functions                 |          1 |          2 |      50.0% |
-| Structs                   |          1 |          2 |      50.0% |
-| Struct Fields             |          0 |          1 |       0.0% |
-| Enums                     |          0 |          1 |       0.0% |
-| Enum Variants             |          2 |          3 |      66.7% |
-| Methods                   |          1 |          2 |      50.0% |
-| Macros                    |          1 |          1 |     100.0% |
-| Extern Types              |          0 |          1 |       0.0% |
-+---------------------------+------------+------------+------------+
-| Total                     |          7 |         14 |      50.0% |
-+---------------------------+------------+------------+------------+
++-------------------------------------+------------+------------+------------+
+| File                                | Documented |      Total | Percentage |
++-------------------------------------+------------+------------+------------+
+| ...est/rustdoc-ui/coverage/basic.rs |          7 |         14 |      50.0% |
++-------------------------------------+------------+------------+------------+
+| Total                               |          7 |         14 |      50.0% |
++-------------------------------------+------------+------------+------------+
diff --git a/src/test/rustdoc-ui/coverage/empty.stdout b/src/test/rustdoc-ui/coverage/empty.stdout
index df68205bbaa..11b514fbfea 100644
--- a/src/test/rustdoc-ui/coverage/empty.stdout
+++ b/src/test/rustdoc-ui/coverage/empty.stdout
@@ -1,7 +1,7 @@
-+---------------------------+------------+------------+------------+
-| Item Type                 | Documented |      Total | Percentage |
-+---------------------------+------------+------------+------------+
-| Modules                   |          0 |          1 |       0.0% |
-+---------------------------+------------+------------+------------+
-| Total                     |          0 |          1 |       0.0% |
-+---------------------------+------------+------------+------------+
++-------------------------------------+------------+------------+------------+
+| File                                | Documented |      Total | Percentage |
++-------------------------------------+------------+------------+------------+
+| ...est/rustdoc-ui/coverage/empty.rs |          0 |          1 |       0.0% |
++-------------------------------------+------------+------------+------------+
+| Total                               |          0 |          1 |       0.0% |
++-------------------------------------+------------+------------+------------+
diff --git a/src/test/rustdoc-ui/coverage/enums.stdout b/src/test/rustdoc-ui/coverage/enums.stdout
index 651ea095310..87e2ad9f20d 100644
--- a/src/test/rustdoc-ui/coverage/enums.stdout
+++ b/src/test/rustdoc-ui/coverage/enums.stdout
@@ -1,10 +1,7 @@
-+---------------------------+------------+------------+------------+
-| Item Type                 | Documented |      Total | Percentage |
-+---------------------------+------------+------------+------------+
-| Modules                   |          1 |          1 |     100.0% |
-| Struct Fields             |          1 |          2 |      50.0% |
-| Enums                     |          2 |          2 |     100.0% |
-| Enum Variants             |          2 |          3 |      66.7% |
-+---------------------------+------------+------------+------------+
-| Total                     |          6 |          8 |      75.0% |
-+---------------------------+------------+------------+------------+
++-------------------------------------+------------+------------+------------+
+| File                                | Documented |      Total | Percentage |
++-------------------------------------+------------+------------+------------+
+| ...est/rustdoc-ui/coverage/enums.rs |          6 |          8 |      75.0% |
++-------------------------------------+------------+------------+------------+
+| Total                               |          6 |          8 |      75.0% |
++-------------------------------------+------------+------------+------------+
diff --git a/src/test/rustdoc-ui/coverage/exotic.stdout b/src/test/rustdoc-ui/coverage/exotic.stdout
index 97eab50a55a..2bacfcfceca 100644
--- a/src/test/rustdoc-ui/coverage/exotic.stdout
+++ b/src/test/rustdoc-ui/coverage/exotic.stdout
@@ -1,9 +1,8 @@
-+---------------------------+------------+------------+------------+
-| Item Type                 | Documented |      Total | Percentage |
-+---------------------------+------------+------------+------------+
-| Modules                   |          1 |          1 |     100.0% |
-| Primitives                |          1 |          1 |     100.0% |
-| Keywords                  |          1 |          1 |     100.0% |
-+---------------------------+------------+------------+------------+
-| Total                     |          3 |          3 |     100.0% |
-+---------------------------+------------+------------+------------+
++-------------------------------------+------------+------------+------------+
+| File                                | Documented |      Total | Percentage |
++-------------------------------------+------------+------------+------------+
+| ...st/rustdoc-ui/coverage/exotic.rs |          1 |          1 |     100.0% |
+| <anon>                              |          2 |          2 |     100.0% |
++-------------------------------------+------------+------------+------------+
+| Total                               |          3 |          3 |     100.0% |
++-------------------------------------+------------+------------+------------+
diff --git a/src/test/rustdoc-ui/coverage/private.stdout b/src/test/rustdoc-ui/coverage/private.stdout
index f1a5461b836..0d4c7c68fd0 100644
--- a/src/test/rustdoc-ui/coverage/private.stdout
+++ b/src/test/rustdoc-ui/coverage/private.stdout
@@ -1,10 +1,7 @@
-+---------------------------+------------+------------+------------+
-| Item Type                 | Documented |      Total | Percentage |
-+---------------------------+------------+------------+------------+
-| Modules                   |          1 |          2 |      50.0% |
-| Functions                 |          1 |          2 |      50.0% |
-| Structs                   |          1 |          1 |     100.0% |
-| Struct Fields             |          1 |          2 |      50.0% |
-+---------------------------+------------+------------+------------+
-| Total                     |          4 |          7 |      57.1% |
-+---------------------------+------------+------------+------------+
++-------------------------------------+------------+------------+------------+
+| File                                | Documented |      Total | Percentage |
++-------------------------------------+------------+------------+------------+
+| ...t/rustdoc-ui/coverage/private.rs |          4 |          7 |      57.1% |
++-------------------------------------+------------+------------+------------+
+| Total                               |          4 |          7 |      57.1% |
++-------------------------------------+------------+------------+------------+
diff --git a/src/test/rustdoc-ui/coverage/statics-consts.stdout b/src/test/rustdoc-ui/coverage/statics-consts.stdout
index 54516fe613f..8459f90ae7b 100644
--- a/src/test/rustdoc-ui/coverage/statics-consts.stdout
+++ b/src/test/rustdoc-ui/coverage/statics-consts.stdout
@@ -1,12 +1,7 @@
-+---------------------------+------------+------------+------------+
-| Item Type                 | Documented |      Total | Percentage |
-+---------------------------+------------+------------+------------+
-| Modules                   |          1 |          1 |     100.0% |
-| Structs                   |          0 |          1 |       0.0% |
-| Traits                    |          1 |          1 |     100.0% |
-| Associated Constants      |          2 |          2 |     100.0% |
-| Statics                   |          1 |          1 |     100.0% |
-| Constants                 |          1 |          1 |     100.0% |
-+---------------------------+------------+------------+------------+
-| Total                     |          6 |          7 |      85.7% |
-+---------------------------+------------+------------+------------+
++-------------------------------------+------------+------------+------------+
+| File                                | Documented |      Total | Percentage |
++-------------------------------------+------------+------------+------------+
+| ...oc-ui/coverage/statics-consts.rs |          6 |          7 |      85.7% |
++-------------------------------------+------------+------------+------------+
+| Total                               |          6 |          7 |      85.7% |
++-------------------------------------+------------+------------+------------+
diff --git a/src/test/rustdoc-ui/coverage/traits.rs b/src/test/rustdoc-ui/coverage/traits.rs
index 0a6defa17f8..5f32d5b0ccc 100644
--- a/src/test/rustdoc-ui/coverage/traits.rs
+++ b/src/test/rustdoc-ui/coverage/traits.rs
@@ -20,7 +20,7 @@ pub struct SomeStruct;
 
 /// ...and slap this trait on it?
 impl ThisTrait for SomeStruct {
-    /// what we get is a perfect combo!
+    /// nothing! trait impls are totally ignored in this calculation, sorry.
     fn right_here(&self) {}
 
     type SomeType = String;
diff --git a/src/test/rustdoc-ui/coverage/traits.stdout b/src/test/rustdoc-ui/coverage/traits.stdout
index 6f5db8729ef..e347a4da0b9 100644
--- a/src/test/rustdoc-ui/coverage/traits.stdout
+++ b/src/test/rustdoc-ui/coverage/traits.stdout
@@ -1,16 +1,7 @@
-+---------------------------+------------+------------+------------+
-| Item Type                 | Documented |      Total | Percentage |
-+---------------------------+------------+------------+------------+
-| Modules                   |          0 |          1 |       0.0% |
-| Structs                   |          1 |          1 |     100.0% |
-| Traits                    |          1 |          1 |     100.0% |
-| Trait Methods             |          2 |          2 |     100.0% |
-| Associated Types          |          1 |          1 |     100.0% |
-| Trait Aliases             |          1 |          1 |     100.0% |
-+---------------------------+------------+------------+------------+
-| Total (non trait impls)   |          6 |          7 |      85.7% |
-+---------------------------+------------+------------+------------+
-| Trait Impl Items          |          2 |          3 |      66.7% |
-+---------------------------+------------+------------+------------+
-| Total                     |          8 |         10 |      80.0% |
-+---------------------------+------------+------------+------------+
++-------------------------------------+------------+------------+------------+
+| File                                | Documented |      Total | Percentage |
++-------------------------------------+------------+------------+------------+
+| ...st/rustdoc-ui/coverage/traits.rs |          6 |          7 |      85.7% |
++-------------------------------------+------------+------------+------------+
+| Total                               |          6 |          7 |      85.7% |
++-------------------------------------+------------+------------+------------+