Add restricted paths

Author: P1n3appl3

src/librustdoc/json/conversions.rs

@@ -80,8 +80,7 @@ impl From<clean::Visibility> for Visibility {
             Public => Visibility::Public,
             Inherited => Visibility::Default,
             Crate => Visibility::Crate,
-            Restricted(_did, _path) => unimplemented!(),
-            // Visibility::Restricted(did.into(), path.whole_name()),
+            Restricted(did, path) => Visibility::Restricted{parent: did.into(), path: path.whole_name()},
         }
     }
 }

src/librustdoc/json/types.rs

@@ -101,7 +101,12 @@ pub enum Visibility {
     /// public traits and variants of public enums.
     Default,
     Crate,
-    // FIXME(pineapple): add support for restricted paths
+    /// For `pub(in path)` visibility. `parent` is the module it's restricted to and `path` is how
+    /// that module was referenced (like `"super::super"` or `"crate::foo::bar"`).
+    Restricted {
+        parent: Id,
+        path: String,
+    },
 }
 
 #[serde(rename_all = "snake_case")]
@@ -440,7 +445,7 @@ pub struct Import {
     /// `use source as name;`
     pub name: String,
     /// The ID of the item being imported.
-    pub id: Option<Id>, // TODO when is this None?
+    pub id: Option<Id>, // FIXME is this actually ever None?
     /// Whether this import uses a glob: `use source::*;`
     pub glob: bool,
 }

src/test/run-make-fulldeps/rustdoc-json/check_missing_items.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-# This test ensures that every ID in the produced json actually resolves to an item either in `index` or `paths`.
-# It DOES NOT check that the structure of the produced json is actually in any way correct,
-# for example an empty map would pass.
+# This test ensures that every ID in the produced json actually resolves to an item either in
+# `index` or `paths`. It DOES NOT check that the structure of the produced json is actually in
+# any way correct, for example an empty map would pass.
 
 import sys
 import json

src/test/run-make-fulldeps/rustdoc-json/compare.py

@@ -42,7 +42,7 @@ def _check_subset(expected, actual, trace):
         if expected_type is dict:
             for key in expected:
                 if key not in actual:
-                    raise SubsetException("Key `{}` not found in output".format(key))
+                    raise SubsetException("Key `{}` not found in output".format(key), trace)
                 new_trace = trace.copy()
                 new_trace.append(key)
                 _check_subset(expected[key], actual[key], new_trace)
@@ -51,7 +51,7 @@ def _check_subset(expected, actual, trace):
             actual_elements = len(actual)
             if expected_elements != actual_elements:
                 raise SubsetException(
-                    "Found {} items, expected {}".format(expected_elements, actual_elements)
+                    "Found {} items, expected {}".format(expected_elements, actual_elements), trace
                 )
             for expected, actual in zip(expected, actual):
                 new_trace = trace.copy()